From 8e5bf1953e26c0fd49f722adccbe7c33b04e1596 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Wed, 24 Jul 2024 15:34:35 +0800
Subject: [PATCH 1/2] gx

---
 src/view/home.vue   |  8 ++++----
 src/view/sy_map.vue | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/view/home.vue b/src/view/home.vue
index b733927..b7e8f53 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -13,7 +13,7 @@
 <script setup>
 import Header from "../components/header.vue";
 
-import { ref, onMounted, onBeforeMount ,watch} from "vue";
+import { ref, onMounted, onBeforeMount ,watch, nextTick} from "vue";
 import { useRouter, useRoute } from "vue-router";
 const router = useRouter();
 const routers = useRoute();
@@ -21,9 +21,9 @@ console.log(routers.path);
 watch(
   () => routers.path,
   (newVal, oldVal) => {
-    if (routers.path == '/home/index/map') {
-  reset_font()
-}
+  nextTick(()=>{
+     reset_font()
+  })
   }
 );
 const reset_font = () => {
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index 4fabb34..07ba352 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -390,7 +390,7 @@ const addPolygonCounty = () => {
         let jdCenter = [];
         if (item.name == "溪口镇") {
           if (!title_choose.value.includes("溪口镇")) {
-            title_choose.value = title_choose.value + `>${polygon.name}`;
+            title_choose.value = title_choose.value + `>${item.name}`;
           }
           loadCs();
           addPolygonCountyCs();
@@ -402,6 +402,7 @@ const addPolygonCounty = () => {
           addCs();
           goMapCenter(jdCenter, 13);
         } else {
+          title_choose.value='龙游县'
           cs_qk_arr.value.forEach((item, index) => {
             map.removeOverlay(cs_qk_arr.value[index]);
           });
@@ -567,7 +568,7 @@ const createCustomOverlayJd2 = (polygon, indexx) => {
     title.appendChild(document.createTextNode(this.properties.title));
     content.appendChild(div);
     var number = document.createElement("div");
-    number.style.fontSize = "16px";
+    number.style.fontSize = "9px";
     number.style.fontWeight = "600";
     number.style.color = "rgba(0, 255, 189, 1)";
     div.appendChild(number);
@@ -881,7 +882,7 @@ const changeRs = (id) => {
     jdm_number_arr.value.forEach((item, index) => {
       map.removeOverlay(jdm_number_arr.value[index]);
     });
-    if (cs_number_name_arr.value) {
+    if (cs_number_name_arr.value?.length) {
       cs_number_name_arr.value.forEach((item, index) => {
         map.removeOverlay(cs_number_name_arr.value[index]);
       });
@@ -901,6 +902,7 @@ const changeRs = (id) => {
     //   addJd();
     // }
   } else {
+    console.log(8888);
     // if(chooseArr.value.includes("jd_number")){
     //   chooseArr.value = chooseArr.value.filter((item) => item !== "jd_number");
     //   chooseArr.value.push("jd_noNumber");
@@ -911,7 +913,7 @@ const changeRs = (id) => {
     jdm_arr.value.forEach((item, index) => {
       map.removeOverlay(jdm_arr.value[index]);
     });
-    if (cs_name_arr.value) {
+    if (cs_name_arr.value?.length) {
       cs_name_arr.value.forEach((item, index) => {
         map.removeOverlay(cs_name_arr.value[index]);
       });

From 97c8e04edc8b88de944dde463a5b4a6e5f9a2faa Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Wed, 24 Jul 2024 15:50:55 +0800
Subject: [PATCH 2/2] gx

---
 src/view/sy_map.vue | 82 +++++++++++++++++++++++++++++++++------------
 1 file changed, 60 insertions(+), 22 deletions(-)

diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index 9209bc6..1eff34d 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -341,7 +341,7 @@ const BMAP = () => {
     // console.log(e.point.latLng.lng,e.point.latLng.lat, 666);
     // var pt = e.point; // 获取点击的坐标
     map.addOverlay(marker);
-    var marker = new BMapGL.Marker(new BMapGL.Point(e.point.lng,e.point.lat)); // 创建点
+    var marker = new BMapGL.Marker(new BMapGL.Point(e.point.lng, e.point.lat)); // 创建点
     // var marker = new BMapGL.Marker(pt); // 创建标注
     map.addOverlay(marker); // 将标注添加到地图中
   });
@@ -385,6 +385,7 @@ const addPolygonCounty = () => {
   map.clearOverlays();
   let fillColor = "#ffffff";
   mapTownDataDK.map((item) => {
+    item.leg = 0;
     //地区的坐标范围
     let points = [];
     item.point.map((p) => points.push(new BMapGL.Point(...p)));
@@ -397,33 +398,37 @@ const addPolygonCounty = () => {
         fillColor: fillColor,
         fillOpacity: 0.7,
         name: item.name,
+        zIndex: 92,
       });
 
       map.addOverlay(polygon);
       polygon.addEventListener("click", () => {
         console.log(item.name);
-        let jdCenter = [];
-        if (item.name == "溪口镇") {
-          if (!title_choose.value.includes("溪口镇")) {
-            title_choose.value = title_choose.value + `>${item.name}`;
-          }
-          loadCs();
-          addPolygonCountyCs();
-          mapTownCount.map((item) => {
-            if (item.name == "溪口镇") {
-              jdCenter = item.center;
-            }
-          });
-          addCs();
-          goMapCenter(jdCenter, 13);
+        if (title_choose.value.includes("溪口镇")) {
         } else {
-          title_choose.value='龙游县'
-          cs_qk_arr.value.forEach((item, index) => {
-            map.removeOverlay(cs_qk_arr.value[index]);
-          });
-          cs_name_arr.value.forEach((item, index) => {
-            map.removeOverlay(cs_name_arr.value[index]);
-          });
+          let jdCenter = [];
+          if (item.name == "溪口镇") {
+            if (!title_choose.value.includes("溪口镇")) {
+              title_choose.value = title_choose.value + `>${item.name}`;
+            }
+            loadCs();
+            addPolygonCountyCs();
+            mapTownCount.map((item) => {
+              if (item.name == "溪口镇") {
+                jdCenter = item.center;
+              }
+            });
+            addCs();
+            goMapCenter(jdCenter, 13);
+          } else {
+            title_choose.value = "龙游县";
+            cs_qk_arr.value.forEach((item, index) => {
+              map.removeOverlay(cs_qk_arr.value[index]);
+            });
+            cs_name_arr.value.forEach((item, index) => {
+              map.removeOverlay(cs_name_arr.value[index]);
+            });
+          }
         }
       });
     }
@@ -484,8 +489,35 @@ const addPolygonCountyCs = () => {
         fillColor: fillColor,
         fillOpacity: 0.7,
         name: item.name,
+        zIndex: 99,
       });
       map.addOverlay(cs_qk_arr.value[index]);
+      cs_qk_arr.value[index].addEventListener("click", () => {
+        console.log(111);
+        // let jdCenter = [];
+        // if (item.name == "溪口镇") {
+        //   if (!title_choose.value.includes("溪口镇")) {
+        //     title_choose.value = title_choose.value + `>${item.name}`;
+        //   }
+        //   loadCs();
+        //   addPolygonCountyCs();
+        //   mapTownCount.map((item) => {
+        //     if (item.name == "溪口镇") {
+        //       jdCenter = item.center;
+        //     }
+        //   });
+        //   addCs();
+        //   goMapCenter(jdCenter, 13);
+        // } else {
+        //   title_choose.value = "龙游县";
+        //   cs_qk_arr.value.forEach((item, index) => {
+        //     map.removeOverlay(cs_qk_arr.value[index]);
+        //   });
+        //   cs_name_arr.value.forEach((item, index) => {
+        //     map.removeOverlay(cs_name_arr.value[index]);
+        //   });
+        // }
+      });
     }
   });
 };
@@ -935,6 +967,12 @@ const changeRs = (id) => {
       cs_name_arr.value.length = 0;
       addCs2();
     }
+    if (jdm_number_arr.value?.length) {
+      jdm_number_arr.value.forEach((item, index) => {
+        map.removeOverlay(jdm_number_arr.value[index]);
+      });
+      jdm_number_arr.value.length = 0;
+    }
     addJd2();
     // removeAllPolygon("person");
     // xuanran();