From fa5def7c0f3d681cc7d0d70ae879a59bd3641553 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Wed, 14 Aug 2024 09:24:00 +0800
Subject: [PATCH] gx

---
 src/view/sy_map.vue | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index 790fb42..137c39a 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -169,8 +169,7 @@
           <div v-else>未居住</div>
         </template>
         <template #sxt="{ currentCol, currentData }">
-          <el-icon size="24" color="#fff" 
-           v-if="currentData.camera"
+          <el-icon size="24" color="#fff" v-if="currentData.camera"
             ><VideoCamera
           /></el-icon>
         </template>
@@ -1424,7 +1423,7 @@ const getDataBqs = async (jd, cs, bq) => {
   getDataBqs2(cfJd.value, cfCs.value, bq);
 };
 //特殊标签获取街道内部人数
-const getDataBqs2 = async (jd, cs, bq, f = true) => {
+const getDataBqs2 = async (jd, cs, bq) => {
   //f用来判断执不执行changeRs2
   let data = {};
   let vv = 0;
@@ -1468,10 +1467,6 @@ const getDataBqs2 = async (jd, cs, bq, f = true) => {
           });
         }
 
-        if (f) {
-          changeRs2(bq);
-        }
-
         cs_name_arr.value.forEach((item, index) => {
           map.removeOverlay(cs_name_arr.value[index]);
         });
@@ -1573,8 +1568,6 @@ const getDataBqs3 = async (jd, cs, bq) => {
 //特殊标签单独获取各个街道人数
 const getDataBqJD = async (bq) => {
   let data = {};
-  console.log(tsbq_id_total.value);
-
   tsbq_id_total.value.forEach((item, index) => {
     if (bq == item.name) {
       data = {
@@ -1596,6 +1589,7 @@ const getDataBqJD = async (bq) => {
             });
           });
         }
+        changeRs2(bq);
       }
     });
 };
@@ -1653,10 +1647,9 @@ const changeys = (name) => {
         img = item.img;
       }
     });
-    if(name=='摄像头'){
-      getZyys(url, name,img);
+    if (name == "摄像头") {
+      getZyys(url, name, img);
     }
-    
   }
 };
 const getZyys = (url, name, img) => {
@@ -1741,7 +1734,7 @@ const to_jd = (item_name) => {
     choose.value.person == "孤儿" ||
     choose.value.person == "特困"
   ) {
-    getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
+    getDataBqs2(cfJd.value, cfCs.value, choose.value.person);
     getDatas(cfJd.value, "", false);
   } else if (choose.value.person != "") {
     if (choose.value.person == "9999") {
@@ -2303,7 +2296,7 @@ const addPolygonCounty = () => {
             choose.value.person == "孤儿" ||
             choose.value.person == "特困"
           ) {
-            getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
+            getDataBqs2(cfJd.value, cfCs.value, choose.value.person);
             getDatas(cfJd.value, "", false);
           } else if (choose.value.person != "") {
             if (choose.value.person == "9999") {