Compare commits

..

4 Commits

Author SHA1 Message Date
姚宇浩 391dc99d08 gx 2024-08-01 15:15:08 +08:00
姚宇浩 6dcd94499f Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-01 15:11:23 +08:00
姚宇浩 1ddaba2a28 gx 2024-08-01 15:08:54 +08:00
姚宇浩 4c73d6e6d0 gx 2024-08-01 15:08:03 +08:00
2 changed files with 64 additions and 48 deletions

View File

@ -10,11 +10,7 @@
>
<template #header="{ close, titleId, titleClass }">
<div class="my-header">
<el-icon
size="26"
color="#fff"
@click="closeDialog"
>
<el-icon size="26" color="#fff" @click="closeDialog">
<CircleCloseFilled />
</el-icon>
</div>
@ -49,6 +45,8 @@
height="100%"
:header-cell-style="{ background: '#008FCD' }"
:key="tableKey"
@row-click="handleRowClick"
class="custom-table-font"
>
<!-- <el-table-column
v-for="(item, index) in data.columns"
@ -88,6 +86,7 @@
<div class="pagePart">
<el-pagination
class="small-pagination"
background
layout="prev, pager, next,total"
:page-size="pagination.pageSize"
@ -113,6 +112,9 @@ import {
nextTick,
} from "vue";
import { CircleCloseFilled } from "@element-plus/icons-vue";
import { useRouter, useRoute } from "vue-router";
const router = useRouter();
const routers = useRoute();
const props = defineProps({
dialogShow: {
type: Boolean,
@ -144,7 +146,13 @@ const props = defineProps({
},
});
const emit = defineEmits(["close", "handle"]);
const handleRowClick = (row, column, event) => {
// row
console.log(row);
router.push({
path: `/home/index/person`,
});
};
//
const dialogShow = ref();
const data = reactive({
@ -269,7 +277,7 @@ const handle = (current) => {
}
.title {
margin: 10px auto;
margin: 0px auto;
display: flex;
flex-direction: column;
@ -285,7 +293,7 @@ const handle = (current) => {
.name {
font-family: PangMenZhengDao, PangMenZhengDao;
font-weight: 600;
font-size: 24px;
font-size: 20px;
color: #ffffff;
line-height: 38px;
text-align: center;
@ -304,4 +312,8 @@ const handle = (current) => {
height: 19px;
}
}
.custom-table-font {
font-size: 10px;
}
</style>

View File

@ -1599,14 +1599,15 @@ const to_jd = (item_name) => {
// } else {
// console.log(111, choose.value.person);
cfJd.value = item_name;
//
let jdCenter = [];
if (item_name == "溪口镇") {
BMAP();
if (choose.value.person == "") {
getDatas("溪口镇", "");
}
loadCs(item_name);
addPolygonCountyCs();
getDataBq(cfJd.value, "");
if (choose.value.person == "") {
getDatas(cfJd.value, "");
}
if (
choose.value.person == "cjr" ||
choose.value.person == "dibian" ||
@ -1617,27 +1618,30 @@ const to_jd = (item_name) => {
choose.value.person == "kjer"
) {
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
getDatas("溪口镇", "");
getDatas(cfJd.value, "");
} else if (choose.value.person != "") {
if (choose.value.person == "9999") {
getDatas("溪口镇", "");
getDatas(cfJd.value, "");
} else {
if (choose.value.person == 1) {
getDatas("溪口镇", "0"); //0
getDatas(cfJd.value, "0"); //0
} else {
getDatas("溪口镇", choose.value.person - 1);
getDatas(cfJd.value, choose.value.person - 1);
}
}
}
loadCs(item_name);
addPolygonCountyCs();
mapTownCount.map((item) => {
if (item.name == item_name) {
jdCenter = item.center;
// if (title_jd.value == item.name) {
// } else {
// title_jd.value = item.name;
// }
mapTownCount.map((itemm) => {
if (itemm.name == item_name) {
jdCenter = itemm.center;
}
});
goMapCenter(jdCenter, 13);
}
// }
};
//
@ -2649,7 +2653,7 @@ const reset_font = () => {
}
};
onMounted(() => {
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
// tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
reset_font();
initMap();
getData();