Merge remote-tracking branch 'origin/master'

gassafety-web/src/components/PopWindow/flowMeter.vue

@@ -18,7 +18,7 @@
                   v-for="item in pipeList"
                   :key="item.pipeId"
                   :label="item.pipeName"
-                  :value="item.pipeId" 
+                  :value="item.pipeId"
                 >
                 </el-option>
               </el-select>
@@ -152,6 +152,7 @@ export default {
       form: {
         deviceType: "3",
       },
+      type: DEVICE_TYPE.FLOWMETER,
       dialogVisible: false,
       fileList: [],
       // 表单校验
@@ -210,16 +211,35 @@ export default {
       this.form.iconUrl = res.url;
     },
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
-          // console.log("this.form流量计",this.form)
-          // return;
         if (valid) {
           if (this.form.deviceId != null) {
             updateDeviceInfo(this.form).then((response) => {
-              this.dialogVisible = false;
-              this.map.remove(this.obj);
-              this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
-              this.msgSuccess("修改成功");
+              if (response.code == 200) {
+                this.dialogVisible = false;
+                const index = this.gaoMap.markers.indexOf(this.obj);
+                if (index >= 0) {
+                  this.gaoMap.markers.splice(index, 1);
+                  this.gaoMap.changePolineListNum = index;
+                }
+                this.map.remove(this.obj);
+                this.gaoMap.addMarker(
+                  // this.form.deviceType,
+                  //这个是上图用的type，跟后台的type不一致
+                  this.type,
+                  this.form,
+                  () => {
+                    const arr = this.gaoMap.markers.map((item) => {
+                      return item.getExtData();
+                    });
+                    console.log(arr);
+                    this.gaoMap.view.deviceClassify(arr);
+                    this.gaoMap.view.pipeList();
+                  }
+                );
+                this.msgSuccess("修改成功");
+              }
             });
           } else {
             addDeviceInfo(this.form).then((response) => {
@@ -227,12 +247,18 @@ export default {
                 this.remove();
                 this.map.remove(this.obj);
                 this.form.deviceId = response.data;
-                this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+                this.gaoMap.addMarker(this.type, this.form, () => {
+                  const arr = this.gaoMap.markers.map((item) => {
+                    return item.getExtData();
+                  });
+                  this.gaoMap.view.deviceClassify(arr);
+                  this.gaoMap.view.pipeList();
+                });
                 //this.gaoMap.placeSearch.clear();
                 this.gaoMap.closeAddMarker();
                 this.msgSuccess("新增成功");
               } else {
-                this.msgSuccess("新增失败");
+                // this.msgSuccess("新增失败");
               }
             });
           }

gassafety-web/src/components/PopWindow/pressureGage.vue

@@ -152,6 +152,7 @@ export default {
       form: {
         deviceType: "4",
       },
+      type: DEVICE_TYPE.PRESSUREGAGE,
       dialogVisible: false,
       fileList: [],
       // 表单校验
@@ -208,16 +209,33 @@ export default {
       this.form.iconUrl = res.url;
     },
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
-        // console.log("this.form)",this.form)
-
         if (valid) {
           if (this.form.deviceId != null) {
             updateDeviceInfo(this.form).then((response) => {
               if (response.code == 200) {
                 this.dialogVisible = false;
+                const index = this.gaoMap.markers.indexOf(this.obj);
+                if (index >= 0) {
+                  this.gaoMap.markers.splice(index, 1);
+                  this.gaoMap.changePolineListNum = index;
+                }
                 this.map.remove(this.obj);
-                this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+                this.gaoMap.addMarker(
+                  // this.form.deviceType,
+                  //这个是上图用的type，跟后台的type不一致
+                  this.type,
+                  this.form,
+                  () => {
+                    const arr = this.gaoMap.markers.map((item) => {
+                      return item.getExtData();
+                    });
+                    console.log(arr);
+                    this.gaoMap.view.deviceClassify(arr);
+                    this.gaoMap.view.pipeList();
+                  }
+                );
                 this.msgSuccess("修改成功");
               }
             });
@@ -227,12 +245,18 @@ export default {
                 this.remove();
                 this.map.remove(this.obj);
                 this.form.deviceId = response.data;
-                this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+                this.gaoMap.addMarker(this.type, this.form, () => {
+                  const arr = this.gaoMap.markers.map((item) => {
+                    return item.getExtData();
+                  });
+                  this.gaoMap.view.deviceClassify(arr);
+                  this.gaoMap.view.pipeList();
+                });
                 //this.gaoMap.placeSearch.clear();
                 this.gaoMap.closeAddMarker();
                 this.msgSuccess("新增成功");
               } else {
-                this.msgSuccess("新增失败");
+                // this.msgSuccess("新增失败");
               }
             });
           }

gassafety-web/src/components/PopWindow/regulatorBox.vue

@@ -14,7 +14,7 @@
                 placeholder="请选择所属管道"
                 style="width: 100%"
               >
-                 <el-option
+                <el-option
                   v-for="item in pipeList"
                   :key="item.pipeId"
                   :label="item.pipeName"
@@ -152,6 +152,7 @@ export default {
       form: {
         deviceType: "1",
       },
+      type: DEVICE_TYPE.REGEULATORBOX,
       dialogVisible: false,
       fileList: [],
       map: null,
@@ -208,15 +209,35 @@ export default {
       this.form.iconUrl = res.url;
     },
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
-        // console.log("this.form",this.form)
         if (valid) {
           if (this.form.deviceId != null) {
             updateDeviceInfo(this.form).then((response) => {
-              this.dialogVisible = false;
-              this.map.remove(this.obj);
-              this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
-              this.msgSuccess("修改成功");
+              if (response.code == 200) {
+                this.dialogVisible = false;
+                const index = this.gaoMap.markers.indexOf(this.obj);
+                if (index >= 0) {
+                  this.gaoMap.markers.splice(index, 1);
+                  this.gaoMap.changePolineListNum = index;
+                }
+                this.map.remove(this.obj);
+                this.gaoMap.addMarker(
+                  // this.form.deviceType,
+                  //这个是上图用的type，跟后台的type不一致
+                  this.type,
+                  this.form,
+                  () => {
+                    const arr = this.gaoMap.markers.map((item) => {
+                      return item.getExtData();
+                    });
+                    console.log(arr);
+                    this.gaoMap.view.deviceClassify(arr);
+                    this.gaoMap.view.pipeList();
+                  }
+                );
+                this.msgSuccess("修改成功");
+              }
             });
           } else {
             addDeviceInfo(this.form).then((response) => {
@@ -224,12 +245,18 @@ export default {
                 this.remove();
                 this.map.remove(this.obj);
                 this.form.deviceId = response.data;
-                this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+                this.gaoMap.addMarker(this.type, this.form, () => {
+                  const arr = this.gaoMap.markers.map((item) => {
+                    return item.getExtData();
+                  });
+                  this.gaoMap.view.deviceClassify(arr);
+                  this.gaoMap.view.pipeList();
+                });
                 //this.gaoMap.placeSearch.clear();
                 this.gaoMap.closeAddMarker();
                 this.msgSuccess("新增成功");
               } else {
-                this.msgSuccess("新增失败");
+                // this.msgSuccess("新增失败");
               }
             });
           }

gassafety-web/src/components/PopWindow/valveWell.vue

@@ -151,6 +151,7 @@ export default {
       form: {
         deviceType: "2",
       },
+      type: DEVICE_TYPE.VALUEWELL,
       dialogVisible: false,
       fileList: [],
       map: null,
@@ -206,14 +207,35 @@ export default {
       this.form.iconUrl = res.url;
     },
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.deviceId != null) {
             updateDeviceInfo(this.form).then((response) => {
-              this.dialogVisible = false;
-              this.map.remove(this.obj);
-              this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
-              this.msgSuccess("修改成功");
+              if (response.code == 200) {
+                this.dialogVisible = false;
+                const index = this.gaoMap.markers.indexOf(this.obj);
+                if (index >= 0) {
+                  this.gaoMap.markers.splice(index, 1);
+                  this.gaoMap.changePolineListNum = index;
+                }
+                this.map.remove(this.obj);
+                this.gaoMap.addMarker(
+                  // this.form.deviceType,
+                  //这个是上图用的type，跟后台的type不一致
+                  this.type,
+                  this.form,
+                  () => {
+                    const arr = this.gaoMap.markers.map((item) => {
+                      return item.getExtData();
+                    });
+                    console.log(arr);
+                    this.gaoMap.view.deviceClassify(arr);
+                    this.gaoMap.view.pipeList();
+                  }
+                );
+                this.msgSuccess("修改成功");
+              }
             });
           } else {
             addDeviceInfo(this.form).then((response) => {
@@ -221,12 +243,18 @@ export default {
                 this.remove();
                 this.map.remove(this.obj);
                 this.form.deviceId = response.data;
-                this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+                this.gaoMap.addMarker(this.type, this.form, () => {
+                  const arr = this.gaoMap.markers.map((item) => {
+                    return item.getExtData();
+                  });
+                  this.gaoMap.view.deviceClassify(arr);
+                  this.gaoMap.view.pipeList();
+                });
                 //this.gaoMap.placeSearch.clear();
                 this.gaoMap.closeAddMarker();
                 this.msgSuccess("新增成功");
               } else {
-                this.msgSuccess("新增失败");
+                // this.msgSuccess("新增失败");
               }
             });
           }

gassafety-web/src/utils/gaodeMap.js

@@ -71,7 +71,6 @@ class gaodeMap {
             this.newLineObj = null;
             this.lineFlag = false;
             this.createNewLine();
-
             console.log("map点击事件新建");
           })
           .catch(() => {});
@@ -171,6 +170,7 @@ class gaodeMap {
   addMarker(markerType, data, func) {
     let that = this;
     that.markerType = markerType;
+    console.log(markerType);
     let infoWindow = new AMap.InfoWindow({
       isCustom: true,
       offset: new AMap.Pixel(24, -38),
@@ -245,6 +245,11 @@ class gaodeMap {
                     that.markers.splice(ind, 1);
                     console.log(that.markers);
                   }
+                  const arr = that.markers.map(item => {
+                    return item.getExtData();
+                  });
+                  that.view.deviceClassify(arr);
+                  that.view.pipeList();
                 }
               });
             })
@@ -286,7 +291,13 @@ class gaodeMap {
       });
     }
 
-    this.markers.push(marker);
+    if (this.changePolineListNum === null) {
+      // this.polyLines.push(polyline);
+      this.markers.push(marker);
+    } else {
+      this.markers.splice(this.changePolineListNum, 0, marker);
+      this.changePolineListNum = null;
+    }
     map.setZoom("11");
     //map.setFitView();
 
@@ -491,12 +502,12 @@ class gaodeMap {
           lineData: item
         }
       });
-        // 如果是修改后包装，有记录的index 就在原位置插入，如果没有，就直接在最后插入
-      if (this.changePolineListNum===null) {
+      // 如果是修改后包装，有记录的index 就在原位置插入，如果没有，就直接在最后插入
+      if (this.changePolineListNum === null) {
         this.polyLines.push(polyline);
-      }else{
-        this.polyLines.splice(this.changePolineListNum,0,polyline);
-        this.changePolineListNum=null;
+      } else {
+        this.polyLines.splice(this.changePolineListNum, 0, polyline);
+        this.changePolineListNum = null;
       }
       // 信息窗体
       const dom = createPop(lineInfoWindow, {
@@ -756,6 +767,16 @@ class gaodeMap {
                 }
               }
               map.remove(obj);
+              // 列表变化
+              const pipeArr= this.polyLines.map(item=>{
+                return item.getExtData().lineData;
+              })
+              const markerArr = this.markers.map(item => {
+                return item.getExtData();
+              });
+              this.view.pipeClassify(pipeArr)
+              this.view.deviceClassify(markerArr);
+              this.view.pipeList();
             }
             vue.$message({
               type: "success",

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/device/pipe/index.vue

@@ -449,6 +449,9 @@
               url: this.form.iconUrl,
             });
           }
+          if(this.form.coordinates){
+            this.str = this.form.coordinates;
+          }
           this.open = true;
           this.title = "修改管道信息";
         });

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();
     },