gx

src/view/sy_map.vue

@@ -294,83 +294,7 @@ const mapTownDataDK = reactive([]);
 //社区地块
 const xkzDk = reactive([]);
 //社区中心点
-const xkzCenter = reactive([
+const xkzCenter = reactive([]);
-  {
-    name: "溪口村",
-    center: [119.2002156322304, 28.83866363229786],
-    number: "50",
-  },
-  {
-    name: "扁石村",
-    center: [119.18143177857742, 28.858795781247416],
-    number: "50",
-  },
-  {
-    name: "大垄村",
-    center: [119.15947390269743, 28.856881986353613],
-    number: "50",
-  },
-  {
-    name: "枫林村",
-    center: [119.2244601402551, 28.874916936765324],
-    number: "50",
-  },
-  {
-    name: "双港口村",
-    center: [119.2112370831526, 28.873145674638753],
-    number: "50",
-  },
-  {
-    name: "灵上村",
-    center: [119.18997199384468, 28.871170115155575],
-    number: "50",
-  },
-  {
-    name: "灵下村",
-    center: [119.19215588030731, 28.890692457149832],
-    number: "50",
-  },
-  {
-    name: "下徐村",
-    center: [119.13517530022014, 28.877528537725134],
-    number: "50",
-  },
-  {
-    name: "大沃口村",
-    center: [119.17629950196843, 28.895987778606404],
-    number: "50",
-  },
-  {
-    name: "寺下村",
-    center: [119.15115841066512, 28.913624042836545],
-    number: "50",
-  },
-  {
-    name: "大阳家村",
-    center: [119.165141274073, 28.89860048623702],
-    number: "50",
-  },
-  {
-    name: "石角村",
-    center: [119.12327500764461, 28.911094612057784],
-    number: "50",
-  },
-  {
-    name: "红罗村",
-    center: [119.18884846618927, 28.911017362099795],
-    number: "50",
-  },
-  {
-    name: "冷水村",
-    center: [119.19787638778016, 28.934598743672993],
-    number: "50",
-  },
-  {
-    name: "新溪社区",
-    center: [119.184555, 28.853068],
-    number: "50",
-  },
-]);
 //村社颜色列表
 const colorList = [
   {
@@ -403,35 +327,15 @@ const colorList = [
 ];
 //存放特殊标签中文对应的简写
 const tsbq_id_total = ref([
-  {
-    name: "残疾人",
-    id: "cjr",
-    tagId: 5,
-  },
-  {
-    name: "低边",
-    id: "dibian",
-    tagId: 2,
-  },
   {
     name: "低保",
     id: "db",
     tagId: 1,
   },
   {
-    name: "高血压",
+    name: "低边",
-    id: "gxy",
+    id: "dibian",
-    tagId: 9,
+    tagId: 2,
-  },
-  {
-    name: "糖尿病",
-    id: "tnb",
-    tagId: 7,
-  },
-  {
-    name: "退役军人",
-    id: "tyjr",
-    tagId: 8,
   },
   {
     name: "困境儿童",
@@ -443,11 +347,31 @@ const tsbq_id_total = ref([
     id: "ge",
     tagId: 4,
   },
+  {
+    name: "残疾人",
+    id: "cjr",
+    tagId: 5,
+  },
   {
     name: "特困",
     id: "tk",
     tagId: 6,
   },
+  {
+    name: "糖尿病",
+    id: "tnb",
+    tagId: 7,
+  },
+  {
+    name: "退役军人",
+    id: "tyjr",
+    tagId: 8,
+  },
+  {
+    name: "高血压",
+    id: "gxy",
+    tagId: 9,
+  },
 ]);
 //单选中社区区块
 const chooseCsList = ref([]);
@@ -612,7 +536,7 @@ const PopulationRatio = ref([
     bgColor: "rgba(222, 173, 98, 1)",
   },
 ]);
-//特殊标签
+//特殊标签左侧数据
 const tsbqTotal = ref([
   {
     id: 10,
@@ -693,14 +617,6 @@ const fwqList = ref([]);
 
 //资源要素
 const yaosuTotal = ref([
-  {
-    id: 11,
-    name: "摄像头",
-    img: j11,
-    img_map:j11_map,
-    wz: false,
-    url: "/api/ggfwyth/ysyzt/getJashsxt",
-  },
   {
     id: 0,
     name: "体育场所",
@@ -768,6 +684,14 @@ const yaosuTotal = ref([
     img: j10,
     wz: true,
   },
+  {
+    id: 11,
+    name: "摄像头",
+    img: j11,
+    img_map: j11_map,
+    wz: false,
+    url: "/api/ggfwyth/ysyzt/getJashsxt",
+  },
 ]);
 //选中的资源要素
 const yaosuList = ref([]);
@@ -1247,12 +1171,8 @@ const getDatas = async (e, i, y = true) => {
           } else {
             if (y) {
               if (choose.value.person == "") {
-                console.log(1111111111);
-
                 addCs();
               } else {
-                console.log(2222222222);
-
                 addCs2();
               }
             }
@@ -1439,19 +1359,28 @@ const getDataBq = async (jd, cs) => {
     .then((res) => {
       if (res.code == 200) {
         tsbqTotal.value.length = 0;
-        res.data.forEach((item, index) => {
+
-          // let idd = "";
+        tsbq_id_total.value.forEach((item, index) => {
-          // tsbq_id_total.value.forEach((itemm, indexx) => {
+          let b = 0;
-          //   if (item.bq == itemm.name) {
+          res.data.forEach((itemm, indexx) => {
-          //     idd = itemm.id;
+            if (itemm.bq == item.name) {
-          //   }
-          // });
               tsbqTotal.value.push({
-            id: item.bq,
+                id: itemm.bq,
-            name: item.bq,
+                name: itemm.bq,
-            rksl: item.rs || 0,
+                rksl: itemm.rs || 0,
+                tagId: itemm.tagId,
+              });
+              b = 1;
+            }
+          });
+          if (b == 0) {
+            tsbqTotal.value.push({
+              id: item.name,
+              name: item.name,
+              rksl: 0,
               tagId: item.tagId,
             });
+          }
         });
       }
     });
@@ -3404,7 +3333,7 @@ onMounted(async () => {
 
   .jbggfwq {
     .jbggfwq_content {
-      height: 500px;
+      height: 520px;
       overflow: auto;
       display: flex;
       flex-direction: column;
@@ -3637,7 +3566,6 @@ onMounted(async () => {
         animation-delay: 0s;
       }
 
-
       @keyframes ball-spin-clockwise-fade {
         50% {
           opacity: 0.25;