Compare commits

..

No commits in common. "391dc99d081d21667dcbc2f18598979c70b41d11" and "1eed49a4b18f5940f1610326c91fb411bb83b8d6" have entirely different histories.

2 changed files with 45 additions and 61 deletions

View File

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

View File

@ -90,7 +90,7 @@
</div> </div>
<div class="tsbq"> <div class="tsbq">
<div class="title"> <div class="title">
<div class="title_name"> <div class="title_name" >
<span>特殊标签</span> <span>特殊标签</span>
</div> </div>
</div> </div>
@ -1599,15 +1599,14 @@ const to_jd = (item_name) => {
// } else { // } else {
// console.log(111, choose.value.person); // console.log(111, choose.value.person);
cfJd.value = item_name; cfJd.value = item_name;
//
let jdCenter = []; let jdCenter = [];
if (item_name == "溪口镇") {
BMAP(); BMAP();
loadCs(item_name);
addPolygonCountyCs();
getDataBq(cfJd.value, "");
if (choose.value.person == "") { if (choose.value.person == "") {
getDatas(cfJd.value, ""); getDatas("溪口镇", "");
} }
getDataBq(cfJd.value, "");
if ( if (
choose.value.person == "cjr" || choose.value.person == "cjr" ||
choose.value.person == "dibian" || choose.value.person == "dibian" ||
@ -1618,30 +1617,27 @@ const to_jd = (item_name) => {
choose.value.person == "kjer" choose.value.person == "kjer"
) { ) {
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
getDatas(cfJd.value, ""); getDatas("溪口镇", "");
} else if (choose.value.person != "") { } else if (choose.value.person != "") {
if (choose.value.person == "9999") { if (choose.value.person == "9999") {
getDatas(cfJd.value, ""); getDatas("溪口镇", "");
} else { } else {
if (choose.value.person == 1) { if (choose.value.person == 1) {
getDatas(cfJd.value, "0"); //0 getDatas("溪口镇", "0"); //0
} else { } else {
getDatas(cfJd.value, choose.value.person - 1); getDatas("溪口镇", choose.value.person - 1);
} }
} }
} }
// if (title_jd.value == item.name) { loadCs(item_name);
// } else { addPolygonCountyCs();
// title_jd.value = item.name; mapTownCount.map((item) => {
// } if (item.name == item_name) {
jdCenter = item.center;
mapTownCount.map((itemm) => {
if (itemm.name == item_name) {
jdCenter = itemm.center;
} }
}); });
goMapCenter(jdCenter, 13); goMapCenter(jdCenter, 13);
}
// } // }
}; };
// //
@ -2631,7 +2627,7 @@ const DGcreateCs2 = (polygon, indexx) => {
}); });
map.addOverlay(cs_dd_arr.value[indexx]); map.addOverlay(cs_dd_arr.value[indexx]);
cs_dd_arr.value[indexx].addEventListener("click", () => { cs_dd_arr.value[indexx].addEventListener("click", () => {
console.log(cfJd.value, polygon.name); console.log(cfJd.value,polygon.name);
open_detail(); open_detail();
}); });
}; };
@ -2653,7 +2649,7 @@ const reset_font = () => {
} }
}; };
onMounted(() => { onMounted(() => {
// tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
reset_font(); reset_font();
initMap(); initMap();
getData(); getData();