gx

src/view/sy_map.vue

@@ -904,7 +904,7 @@ const markera = (e) => {
 };
 //点击人口数
 const buten = async (item) => {
-  if (choose.value.person == item.id) {
+  if (choose.value.person == item.age) {
     choose.value.person = "";
     jdm_number_arr.value.forEach((item, index) => {
       map.removeOverlay(jdm_number_arr.value[index]);
@@ -1265,8 +1265,18 @@ const getDatas2 = async (e, i, cs) => {
         personTotal.value[1].rksl = res.data.swrs;
         personTotal.value[1].ages = "近一年死亡";
         personTotal.value[1].percent = res.data.swrsPercent;
+        // res.data.age.forEach((item, index) => {
+        //   personTotal.value.push({
+        //     id: index + 1,
+        //     rksl: item.rksl,
+        //     age: item.age + "",
+        //     ages: item.age + "岁",
+        //     percent: item.percent,
+        //   });
+        // });
         let before_age = "";
         res.data.age.forEach((item, index) => {
+   
           if (index == 0 && item.age == 0) {
             personTotal.value.push({
               rksl: item.rksl,
@@ -1382,7 +1392,6 @@ const getDataBq = async (jd, cs) => {
             tagId: item.tagId,
           });
         });
-
       }
     });
 };
@@ -1492,7 +1501,7 @@ const getDataBqs3 = async (jd, cs, bq) => {
   });
   if (cs == "" && jd == "") {
     data = {
-      tagId: tagIdBq,
+      tagId: btagIdBqq,
     };
     vv = 1;
   } else if (cs == "") {
@@ -1540,6 +1549,8 @@ 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 = {
@@ -1566,6 +1577,13 @@ const getDataBqJD = async (bq) => {
 };
 //人口，标签切换执行
 const changeRs = (id) => {
+  // if (choose.value.person == id) {
+  //   choose.value.person = "";
+  //   jdm_number_arr.value.forEach((item, index) => {
+  //     map.removeOverlay(jdm_number_arr.value[index]);
+  //   });
+  //   addJd();
+  // } else {
   choose.value.person = id;
   jdm_arr.value.forEach((item, index) => {
     map.removeOverlay(jdm_arr.value[index]);
@@ -1574,8 +1592,16 @@ const changeRs = (id) => {
     map.removeOverlay(jdm_number_arr.value[index]);
   });
   addJd2();
+  // }
 };
 const changeRs2 = (id) => {
+  // if (choose.value.person == id) {
+  //   choose.value.person = "";
+  //   jdm_number_arr.value.forEach((item, index) => {
+  //     map.removeOverlay(jdm_number_arr.value[index]);
+  //   });
+  //   addJd();
+  // } else {
   choose.value.person = id;
   jdm_arr.value.forEach((item, index) => {
     map.removeOverlay(jdm_arr.value[index]);
@@ -1584,6 +1610,7 @@ const changeRs2 = (id) => {
     map.removeOverlay(jdm_number_arr.value[index]);
   });
   addJd2();
+  // }
 };
 //----------资源要素------------
 //判断数组中是否包含某个字符
@@ -2786,18 +2813,7 @@ const createCs2 = (polygon, indexx) => {
   map.addOverlay(cs_number_name_arr.value[indexx]);
   cs_number_name_arr.value[indexx].addEventListener("click", () => {
     cfCsZs.value = polygon.name;
-    // 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 {
     open_detail();
-    // }
   });
 };
 //添加单个村社
@@ -2935,18 +2951,7 @@ const DGcreateCs2 = (polygon, indexx) => {
   cs_dd_arr.value[indexx].addEventListener("click", () => {
     console.log(cfJd.value, polygon.name);
     cfCsZs.value = polygon.name;
-    // 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 {
     open_detail();
-    // }
   });
 };
 //适配