Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
duanxiaohai 2024-07-25 15:10:41 +08:00
commit c985a328a5
1 changed files with 35 additions and 15 deletions

View File

@ -220,6 +220,10 @@ const csh = () => {
cs_choose_arr.value = []; cs_choose_arr.value = [];
cs_un_choose_arr.value = []; cs_un_choose_arr.value = [];
cs_dd_arr.value = []; cs_dd_arr.value = [];
map.removeEventListener("click", markera);
if (currentMarker !== null) {
map.removeOverlay(currentMarker);
}
goMapCenter([119.178783, 29.034583], 11); goMapCenter([119.178783, 29.034583], 11);
getData(); getData();
}; };
@ -491,9 +495,9 @@ const addPolygonCounty = () => {
let jdCenter = []; let jdCenter = [];
if (item.name == "溪口镇") { if (item.name == "溪口镇") {
BMAP(); BMAP();
console.log('cjhsbchjs vbchsj',choose.value.person); console.log("cjhsbchjs vbchsj", choose.value.person);
if (choose.value.person == 0) { if (choose.value.person == 0) {
getDatas("溪口镇", ''); getDatas("溪口镇", "");
} else { } else {
getDatas("溪口镇", choose.value.person); getDatas("溪口镇", choose.value.person);
} }
@ -2103,10 +2107,18 @@ const getData = async (i, e) => {
}); });
}); });
} }
res.data.town.map((item) => { // res.data.town.map((item) => {
mapTownCount.map((items) => { // mapTownCount.map((items) => {
if (item.town == items.name) { // if (item.town == items.name) {
items.number = item.rksl; // items.number = item.rksl;
// }
// });
// });
mapTownCount.map((item) => {
item.number = 0;
res.data.town.map((items) => {
if (items.town == item.name) {
item.number = items.rksl;
} }
}); });
}); });
@ -2143,10 +2155,18 @@ const getDatas = async (e, i) => {
}); });
} }
res.data.committee.map((item) => { // res.data.committee.map((item) => {
xkzCenter.map((items) => { // xkzCenter.map((items) => {
if (item.committee == items.name) { // if (item.committee == items.name) {
items.number = item.rksl; // items.number = item.rksl;
// }
// });
// });
xkzCenter.map((item) => {
item.number=0;
res.data.committee.map((items) => {
if (items.committee == item.name) {
item.number = items.rksl;
} }
}); });
}); });