From 36fb52e530c6c1ec3cd4ffe928d29ec9f12a2190 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 20 Dec 2023 16:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index.vue     |  4 ++--
 src/views/bigScreen/map/index.vue | 40 +++++++++++++++----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 5a73d7e..afe00f7 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-14 14:40:02
  * @LastEditors: JC9527
- * @LastEditTime: 2023-12-20 10:36:23
+ * @LastEditTime: 2023-12-20 14:58:40
 -->
 <template>
   <div class="pc-container">
@@ -12,7 +12,7 @@
       <div class="left-tags">
         <div class="new-time">{{ now.date }}</div>
         <div class="new-time">{{ now.hour + ":" + now.minute + ":" + now.second }}</div>
-        <div class="new-work" @click="getcodeImg">{{ currentWork }}</div>
+        <div class="new-work">{{ currentWork }}</div>
       </div>
       <div class="system-title" text="城市精细化管理监测主题">
         城市精细化管理监测主题
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index cab0f8b..44bc686 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -503,16 +503,6 @@ export default {
       // console.log(o.getCenter())
       // console.log(this.map,'initMapinitMap');
       this.$nextTick(() => {
-        // 获取网格数据
-        this.getWanggeGeoJson();
-        // 获取围栏数据
-        this.getWeilanGeoJson();
-        // 获取重点区域数据
-        this.getQuyuGeoJson();
-        // 获取重点路段数据
-        this.getLuduanGeoJson();
-        // 获取点位
-        this.getMarkers(1);
         AMap.plugin('AMap.GeoJSON',()=>{
           let polygon
           var geojson = new AMap.GeoJSON({
@@ -530,6 +520,16 @@ export default {
           map.add(geojson)
           map.setFitView(polygon);
         })
+        // 获取网格数据
+        this.getWanggeGeoJson();
+        // 获取围栏数据
+        this.getWeilanGeoJson();
+        // 获取重点区域数据
+        this.getQuyuGeoJson();
+        // 获取重点路段数据
+        this.getLuduanGeoJson();
+        // 获取点位
+        this.getMarkers(1);
       });
       // console.log(this.$refs.map.$$getInstance(),'TTTTTTT')
     },
@@ -1015,8 +1015,8 @@ export default {
               'white-space': 'nowrap',
             },
           });
-          this.map.add(wangge);
-          this.map.add(text);
+          this.map.add([wangge,text]);
+          // this.map.add(text);
         })
       })
     },
@@ -1052,8 +1052,8 @@ export default {
                 'white-space': 'nowrap',
               },
             });
-            this.map.add(circle);
-            this.map.add(text);
+            this.map.add([circle,text]);
+            // this.map.add(text);
             // 多边形围栏
           } else if (shapeStr.features[0].geometry.type == "Polygon") {
             var wangge = new AMap.Polygon({
@@ -1081,8 +1081,8 @@ export default {
                 'white-space': 'nowrap',
               },
             });
-            this.map.add(wangge);
-            this.map.add(text);
+            this.map.add([wangge,text]);
+            // this.map.add(text);
           }
         })
       })
@@ -1114,8 +1114,8 @@ export default {
               'white-space': 'nowrap',
             },
           });
-          this.map.add(quyu);
-          this.map.add(text);
+          this.map.add([quyu,text]);
+          // this.map.add(text);
         })
       })
     },
@@ -1146,8 +1146,8 @@ export default {
               'white-space': 'nowrap',
             },
           });
-          this.map.add(luduan);
-          this.map.add(text);
+          this.map.add([luduan,text]);
+          // this.map.add(text);
         })
       })
     },