From 1a4515dd41df17807c2bab7897a37c2c73d256d5 Mon Sep 17 00:00:00 2001 From: wanghui Date: Fri, 26 Jul 2024 16:11:15 +0800 Subject: [PATCH 1/7] 11 --- src/view/sy_map.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 837dcc6..b492c5b 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -232,6 +232,7 @@ const csh = () => { } goMapCenter([119.178783, 29.034583], 11); getData(); + getDataBq() }; //选中社区 const chooseCsList = ref([]); @@ -594,6 +595,8 @@ const addPolygonCounty = () => { cs_un_choose_arr.value = []; cs_dd_arr.value = []; getData(); + getDataBq() + } } @@ -699,13 +702,12 @@ const addPolygonCountyCs = () => { }); } if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { - console.log(1, '溪口镇'); getDataBqs2(cfJd.value, cfCs.value, ''); + getDataBq(cfJd.value, cfCs.value) } else { console.log(2, '溪口镇'); - getDatas2('溪口镇', choose.value.person, cfCs.value); - + getDataBq(cfJd.value, cfCs.value) } addCsChoose(); addCsUnChoose(); @@ -796,6 +798,7 @@ const addCsUnChoose = () => { map.removeOverlay(cs_qk_arr.value[index]); }); getDatas2(cfJd.value, choose.value.person, cfCs.value); + getDataBq(cfJd.value, cfCs.value) if (choose.value.person == "") { cs_dd_arr.value.map((item, index) => { DGcreateCs(item, index); From 2824aae6e8443b8d5971c38d4bc96e6d22e87aa2 Mon Sep 17 00:00:00 2001 From: wanghui Date: Fri, 26 Jul 2024 16:35:26 +0800 Subject: [PATCH 2/7] 11 --- src/view/sy_map.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index b492c5b..79f66ec 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -534,7 +534,7 @@ const addPolygonCounty = () => { getDataBq(cfJd.value, ""); } else if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { getDataBq(cfJd.value, ""); - getDataBqs2(cfJd.value, '', choose.value.person,); + getDataBqs2(cfJd.value, cfCs.value, choose.value.person,); console.log(3); } else { console.log(4); @@ -702,12 +702,11 @@ const addPolygonCountyCs = () => { }); } if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { - getDataBqs2(cfJd.value, cfCs.value, ''); getDataBq(cfJd.value, cfCs.value) + getDataBqs2(cfJd.value, cfCs.value, choose.value.person); } else { console.log(2, '溪口镇'); getDatas2('溪口镇', choose.value.person, cfCs.value); - getDataBq(cfJd.value, cfCs.value) } addCsChoose(); addCsUnChoose(); @@ -798,7 +797,6 @@ const addCsUnChoose = () => { map.removeOverlay(cs_qk_arr.value[index]); }); getDatas2(cfJd.value, choose.value.person, cfCs.value); - getDataBq(cfJd.value, cfCs.value) if (choose.value.person == "") { cs_dd_arr.value.map((item, index) => { DGcreateCs(item, index); @@ -2394,9 +2392,8 @@ const getDataBqs = async (jd, cs, bq) => { console.log(mapTownCount, 'mapTownCount'); changeRs2(bq); if (jd) { - addCs2(); + getDataBqs2(cfJd.value, cfCs.value, choose.value.person,); } - } }); }; From f715f6b7494c153b076f7ded360ff678e0149fec Mon Sep 17 00:00:00 2001 From: wanghui Date: Fri, 26 Jul 2024 16:44:29 +0800 Subject: [PATCH 3/7] 11 --- src/view/sy_map.vue | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 79f66ec..1ff5c25 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -706,7 +706,9 @@ const addPolygonCountyCs = () => { getDataBqs2(cfJd.value, cfCs.value, choose.value.person); } else { console.log(2, '溪口镇'); + getDataBqs(cfJd.value, cfCs.value) getDatas2('溪口镇', choose.value.person, cfCs.value); + } addCsChoose(); addCsUnChoose(); @@ -796,6 +798,7 @@ const addCsUnChoose = () => { cs_un_choose_arr.value.forEach((item, index) => { map.removeOverlay(cs_qk_arr.value[index]); }); + getDataBqs(cfJd.value, cfCs.value) getDatas2(cfJd.value, choose.value.person, cfCs.value); if (choose.value.person == "") { cs_dd_arr.value.map((item, index) => { @@ -2390,10 +2393,11 @@ const getDataBqs = async (jd, cs, bq) => { }); }); console.log(mapTownCount, 'mapTownCount'); - changeRs2(bq); - if (jd) { - getDataBqs2(cfJd.value, cfCs.value, choose.value.person,); - } + // changeRs2(bq); + choose.value.person = bq + // if (jd) { + getDataBqs2(cfJd.value, cfCs.value, choose.value.person,); + // } } }); }; @@ -2441,7 +2445,35 @@ const getDataBqs2 = async (jd, cs, bq) => { }); console.log(mapTownCount); changeRs2(bq); - addCs2(); + if (title_choose.value == "") { + } else { + if (sfdd.value) { + if (choose.value.person == "") { + cs_dd_arr.value.forEach((item, index) => { + map.removeOverlay(cs_dd_arr.value[index]); + }); + cs_dd_arr.value = [...xuanzhongCs.value]; + cs_dd_arr.value.map((item, index) => { + DGcreateCs(item, index); + }); + } else { + cs_dd_arr.value.forEach((item, index) => { + map.removeOverlay(cs_dd_arr.value[index]); + }); + cs_dd_arr.value = [...xuanzhongCs.value]; + cs_dd_arr.value.map((item, index) => { + DGcreateCs2(item, index); + }); + } + } else { + console.log("hhhhh", xkzCenter); + if (choose.value.person == "") { + addCs(); + } else { + addCs2(); + } + } + } } }); }; From 227b2f1531577c64c419fb973bb75f90d3a2c8be Mon Sep 17 00:00:00 2001 From: wanghui Date: Fri, 26 Jul 2024 17:01:10 +0800 Subject: [PATCH 4/7] 11 --- src/view/sy_map.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 1ff5c25..692cca3 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -2255,6 +2255,9 @@ const getDatas = async (e, i) => { cs_number_name_arr.value.forEach((item, index) => { map.removeOverlay(cs_number_name_arr.value[index]); }); + cs_dd_arr.value.forEach((item, index) => { + map.removeOverlay(cs_dd_arr.value[index]); + }); if (title_choose.value == "") { } else { @@ -2280,7 +2283,9 @@ const getDatas = async (e, i) => { console.log("hhhhh", xkzCenter); if (choose.value.person == "") { addCs(); + console.log(1, '222222222'); } else { + console.log(2, '222222222'); addCs2(); } } @@ -2445,6 +2450,16 @@ const getDataBqs2 = async (jd, cs, bq) => { }); console.log(mapTownCount); changeRs2(bq); + + cs_name_arr.value.forEach((item, index) => { + map.removeOverlay(cs_name_arr.value[index]); + }); + cs_number_name_arr.value.forEach((item, index) => { + map.removeOverlay(cs_number_name_arr.value[index]); + }); + cs_dd_arr.value.forEach((item, index) => { + map.removeOverlay(cs_dd_arr.value[index]); + }); if (title_choose.value == "") { } else { if (sfdd.value) { @@ -2468,8 +2483,12 @@ const getDataBqs2 = async (jd, cs, bq) => { } else { console.log("hhhhh", xkzCenter); if (choose.value.person == "") { + console.log(2, '222222222'); + addCs(); } else { + console.log(1, '222222222'); + addCs2(); } } From 15077ca9789937d353b3c81f99dfb21c25d808b6 Mon Sep 17 00:00:00 2001 From: wanghui Date: Fri, 26 Jul 2024 17:04:31 +0800 Subject: [PATCH 5/7] 11 --- src/view/sy_map.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 692cca3..7ed6a98 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -2483,12 +2483,9 @@ const getDataBqs2 = async (jd, cs, bq) => { } else { console.log("hhhhh", xkzCenter); if (choose.value.person == "") { - console.log(2, '222222222'); addCs(); } else { - console.log(1, '222222222'); - addCs2(); } } From eaf6e71483730e52171c60091c761a578000c3f1 Mon Sep 17 00:00:00 2001 From: wanghui Date: Fri, 26 Jul 2024 17:13:15 +0800 Subject: [PATCH 6/7] 11 --- src/view/sy_map.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 7ed6a98..b877852 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -914,13 +914,14 @@ const createCustomOverlayJd2 = (polygon, indexx) => { } let num = ""; if (choose.value.person == "6666") { + console.log(1); num = "swrs"; - } if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { + } else if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { num = "numbers"; - } else { num = "number"; } + console.log(num); jdm_number_arr.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, { point: new BMapGL.Point(...polygon.center), opacity: 0.5, @@ -997,7 +998,7 @@ const createCs2 = (polygon, indexx) => { let num = ""; if (choose.value.person == "6666") { num = "swrs"; - } if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { + } else if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { num = "numbers"; } else { @@ -1177,7 +1178,7 @@ const DGcreateCs2 = (polygon, indexx) => { let num = ""; if (choose.value.person == "6666") { num = "swrs"; - } if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { + } else if (choose.value.person == "cjr" || choose.value.person == "dibian" || choose.value.person == "db" || choose.value.person == "gxy" || choose.value.person == "tnb" || choose.value.person == "tyjr" || choose.value.person == "kjer") { num = "numbers"; } else { From 3909f12f07f3b95b578eab24527d1858515296e9 Mon Sep 17 00:00:00 2001 From: wanghui Date: Fri, 26 Jul 2024 17:15:23 +0800 Subject: [PATCH 7/7] 11 --- src/view/sy_map.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index b877852..d125206 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -921,7 +921,6 @@ const createCustomOverlayJd2 = (polygon, indexx) => { } else { num = "number"; } - console.log(num); jdm_number_arr.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, { point: new BMapGL.Point(...polygon.center), opacity: 0.5, @@ -1184,7 +1183,6 @@ const DGcreateCs2 = (polygon, indexx) => { } else { num = "number"; } - console.log("单个", num); cs_dd_arr.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, { point: new BMapGL.Point(...polygon.center), opacity: 0.5,