From 9419c7048a0aa9b4e823fd218d7b8f1d0bc548fd Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Thu, 5 Sep 2024 13:02:01 +0800
Subject: [PATCH] 1

---
 src/view/sy_map.vue | 63 +++++++++++++++++++--------------------------
 src/view/yl.vue     |  1 -
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index c0d12a3..74e3d3a 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -1837,9 +1837,9 @@ const buten = async (item) => {
     if (title_jd.value == "") {
     } else {
       if (sfdd.value) {
-        cs_dd_arr.value.forEach((item, index) => {
-          map.removeOverlay(cs_dd_arr.value[index]);
-        });
+        // 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);
@@ -1877,9 +1877,9 @@ const buten2 = async (item) => {
     if (title_jd.value == "") {
     } else {
       if (sfdd.value) {
-        cs_dd_arr.value.forEach((item, index) => {
-          map.removeOverlay(cs_dd_arr.value[index]);
-        });
+        // 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);
@@ -2088,17 +2088,17 @@ const getDatas = async (e, i, y = true) => {
         } 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.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.forEach((item, index) => {
+              //   map.removeOverlay(cs_dd_arr.value[index]);
+              // });
 
               cs_dd_arr.value = [...xuanzhongCs.value];
               cs_dd_arr.value.map((item, index) => {
@@ -2267,16 +2267,7 @@ const getDatas2 = async (e, i, cs) => {
       }
     });
   if (
-    // i1 == "残疾人" ||
-    // i1 == "低边" ||
-    // i1 == "低保" ||
-    // i1 == "高血压" ||
-    // i1 == "糖尿病" ||
-    // i1 == "退役军人" ||
-    // i1 == "困境儿童" ||
-    // i1 == "孤儿" ||
-    // i1 == "特困" ||
-    // i1 == "精神病人"
+
     tsbq_pp.value.includes(i1)
   ) {
   } else {
@@ -2410,15 +2401,15 @@ const getDataBqs2 = async (jd, cs, bq) => {
         if (title_jd.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 {
+            // 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]);
               });
@@ -2426,13 +2417,13 @@ const getDataBqs2 = async (jd, cs, bq) => {
               cs_dd_arr.value.map((item, index) => {
                 DGcreateCs2(item, index);
               });
-            }
+            // }
           } else {
-            if (choose.value.person == "") {
-              addCs();
-            } else {
+            // if (choose.value.person == "") {
+            //   addCs();
+            // } else {
               addCs2();
-            }
+            // }
           }
         }
       }
diff --git a/src/view/yl.vue b/src/view/yl.vue
index 38294a8..e2c27f4 100644
--- a/src/view/yl.vue
+++ b/src/view/yl.vue
@@ -630,7 +630,6 @@ const getData = () => {
       data.oldAgePercent = res.data.lnrgnljzb.oldAgePercent;
       data.oldAgeTotal = res.data.lnrgnljzb.oldAgeTotal;
       data.rkgk = res.data.lnrgnljzb.rkgk;
-
       // 更新 data.ylLnrkgk
       data.ylLnrkgk = res.data.ylLnrkgk;
       data.ylLnrkgk.rkzsman = ageGroups.reduce(