地图基本功能完毕

gassafety-web/src/views/device/map/index.vue

@@ -516,24 +516,30 @@ export default {
       this.leftBarNum = [1, 2, 3, 4, 7];
       // map.remove(this.gaodeMap.markerOverlays);
     },
-    search() {
+    async search() {
       this.searchClear();
       map.clearMap();
       this.gaoMap.placeSearch.clear();
       if (!(!this.gaoMap.searchSelectAdcode && !this.gaoMap.searchSelectName)) {
         this.gaoMap.placeSearch.setCity(this.gaoMap.searchSelectAdcode);
         this.gaoMap.placeSearch.search(this.gaoMap.searchSelectName);
-        this.getDeviceInfo({ deviceName: this.gaoMap.searchSelectName });
+        this.gaoMap.markers = [];
+        await this.getDeviceInfo({ deviceName: this.gaoMap.searchSelectName });
         this.gaoMap.polyLines = [];
-        this.getPipeList({ pipeName: this.gaoMap.searchSelectName });
+        await this.getPipeList({ pipeName: this.gaoMap.searchSelectName });
         this.gaoMap.searchSelectAdcode = undefined;
         this.gaoMap.searchSelectName = undefined;
       } else {
         this.gaoMap.placeSearch.search(this.keyWord);
-        this.getDeviceInfo({ deviceName: this.keyWord });
+        this.gaoMap.markers = [];
+        await this.getDeviceInfo({ deviceName: this.keyWord });
         this.gaoMap.polyLines = [];
-        this.getPipeList({ pipeName: this.keyWord });
+        await this.getPipeList({ pipeName: this.keyWord });
       }
+      this.changeBtnData.forEach((item) => {
+        item.nowPage = 1;
+      });
+      this.pipeList();
     },
     // 新建下拉列表关闭 window点击事件
     barClose() {
@@ -556,10 +562,15 @@ export default {
       this.createValue = 0;
       this.createLabel = "新建";
       this.targetNum = 0;
+
       map.clearMap();
-      this.initMap();
-      this.leftBarNum = [1, 2, 3, 4, 7];
       this.keyWord = "";
+      this.arrowRightNum = [];
+      this.leftBarNum = [1, 2, 3, 4, 7];
+      this.changeBtnData.forEach((item) => {
+        item.nowPage = 1;
+      });
+      this.initMap();
     },
 
     // 向右的箭头的动画

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -810,7 +810,7 @@ export default {
         // 工作人员
         this.workerManInfoWindowShow(iten, lat, lng);
       } else if (item.value == 8) {
-        this.trouleInfoWindowShow(iten, lat, lng)
+        this.trouleInfoWindowShow(iten, lat, lng);
       } else {
         // 其他设备
         this.diveceInfoWindowShow(iten, lat, lng);
@@ -1196,7 +1196,7 @@ export default {
         // 左边全选
         this.leftBarNum = [1, 2, 3, 4, 7, 8, 9];
         // 右转箭头的样式active判定
-        this.arrowRightNum = [];
+        // this.arrowRightNum = [];
         // 清空左边列表
         // this.changeBtnDataClear();
         // this.gaoMap.placeSearch.search(this.keyWord);
@@ -1208,9 +1208,11 @@ export default {
         await this.getInspectorLocations({ userName: this.keyWord });
         await this.getMapHiddenTroublelist({ troubleName: this.keyWord });
 
-
         // 设备报警
         this.getSelectAlarmDevice();
+        this.changeBtnData.forEach((item) => {
+          item.nowPage = 1;
+        });
         this.pipeList();
       }
     },
@@ -1245,13 +1247,17 @@ export default {
     },
     refreshMap() {
       // this.changeBtnDataClear();
-      this.keyWord="";
-      this.arrowRightNum=[];
+      this.keyWord = "";
+      this.arrowRightNum = [];
       this.iconClass = "icon-create";
       this.createValue = 0;
       this.createLabel = "新建";
       this.targetNum = 0;
+      this.changeBtnData.forEach((item) => {
+        item.nowPage = 1;
+      });
       map.clearMap();
+      
       this.leftBarNum = [1, 2, 3, 4, 7, 8, 9];
       this.initMap();
     },