地图问题修改 gengdidi

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

@@ -2,15 +2,14 @@
   <el-dialog
     :title="title"
     :visible.sync="dialogVisible"
-    width="80%"
     :before-close="handleClose"
   >
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="22">
+          <el-col :span="11">
             <el-form-item label="所属管道" prop="pipeCode">
-              <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+              <el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
                 <el-option
                   v-for="item in pipeList"
                   :key="item.pipeCode"
@@ -233,12 +232,19 @@ export default {
       this.form.url = "";
       this.fileArr = [];
     },
+    getPipeInfos(){
+      pipeAllInfoList({}).then((response) => {
+        this.pipeList = response.data;
+      });
+    }
   },
-  mounted() {
-    pipeAllInfoList({}).then((response) => {
-      this.pipeList = response.data;
-    });
-  },
+  watch:{
+    dialogVisible(val){
+      if(val){
+        this.getPipeInfos();
+      }
+    }
+  }
 };
 </script>
 

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

@@ -2,7 +2,7 @@
   <div class="wrapper">
     <span class="dot-left"></span>
     <div class="top display-default">
-      <div class="left text">{{title}}</div>
+      <div class="left text">{{data.deviceName}}</div>
       <div class="right text">
         <img src="../../assets/images/closeBtn.png" alt="" @click="map.clearInfoWindow()"/>
       </div>
@@ -11,7 +11,7 @@
     <div class="content">
       <div class="eq-content display-default">
         <div class="text-wrapper">
-          <div class="eq-text">设备名称：<span>{{data.deviceName}}</span></div>
+          <div class="eq-text">设备类型：<span>{{title}}</span></div>
           <div class="eq-text">设备型号：<span>{{data.deviceModel}}</span></div>
           <div class="eq-text">所属管道：<span>{{data.pipeCode}}</span></div>
           <div class="eq-text">物联网编号：<span>{{data.iotNo}}</span></div>

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

@@ -2,15 +2,14 @@
   <el-dialog
     :title="title"
     :visible.sync="dialogVisible"
-    width="80%"
     :before-close="handleClose"
   >
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="22">
+          <el-col :span="11">
             <el-form-item label="所属管道" prop="pipeCode">
-              <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+              <el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
                 <el-option
                   v-for="item in pipeList"
                   :key="item.pipeCode"
@@ -203,12 +202,19 @@ export default {
       this.form.url = "";
       this.fileArr = [];
     },
+    getPipeInfos(){
+      pipeAllInfoList({}).then((response) => {
+        this.pipeList = response.data;
+      });
+    }
   },
-  mounted() {
-    pipeAllInfoList({}).then((response) => {
-      this.pipeList = response.data;
-    });
-  },
+  watch:{
+    dialogVisible(val){
+      if(val){
+        this.getPipeInfos();
+      }
+    }
+  }
 };
 </script>
 

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

@@ -2,14 +2,13 @@
   <el-dialog
     :title="title"
     :visible.sync="dialogVisible"
-    width="80%"
     :before-close="handleClose">
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="22">
+          <el-col :span="11">
             <el-form-item label="所属管道" prop="pipeCode">
-              <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+              <el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
                 <el-option
                   v-for="item in pipeList"
                   :key="item.pipeCode"
@@ -224,12 +223,19 @@
       },
       handleClose(done) {
         done();
+      },
+      getPipeInfos(){
+        pipeAllInfoList({}).then((response) => {
+          this.pipeList = response.data;
+        });
       }
     },
-    mounted(){
-      pipeAllInfoList({}).then(response => {
-        this.pipeList = response.data;
-      });
+    watch:{
+      dialogVisible(val){
+        if(val){
+          this.getPipeInfos();
+        }
+      }
     }
   }
 </script>

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

@@ -2,14 +2,13 @@
   <el-dialog
     :title="title"
     :visible.sync="dialogVisible"
-    width="80%"
     :before-close="handleClose">
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="22">
+          <el-col :span="11">
             <el-form-item label="所属管道" prop="pipeCode">
-              <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+              <el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
                 <el-option
                   v-for="item in pipeList"
                   :key="item.pipeCode"
@@ -222,12 +221,19 @@
       listRemove(e) {
         this.form.url = "";
         this.fileArr = [];
+      },
+      getPipeInfos(){
+        pipeAllInfoList({}).then((response) => {
+          this.pipeList = response.data;
+        });
       }
     },
-    mounted(){
-      pipeAllInfoList({}).then(response => {
-        this.pipeList = response.data;
-      });
+    watch:{
+      dialogVisible(val){
+        if(val){
+          this.getPipeInfos();
+        }
+      }
     }
   }
 </script>

gassafety-web/src/utils/gaodeMap.js

@@ -164,7 +164,7 @@ class gaodeMap {
       marker.on("mouseout", infoClose);
       marker.setExtData(data);
       that.deviceType = markerType;
-      let editWindow = that.createInfowindow();
+      let editWindow = that.createInfowindow("编辑");
       editWindow.fileArr =
         data.iconUrl != "" && data.iconUrl != undefined
           ? [{ url: data.iconUrl }]
@@ -177,7 +177,8 @@ class gaodeMap {
           editWindow.form = e.target.getExtData();
           editWindow.show();
         } else if ("delete" == that.mapOperateType) {
-          vue.$confirm("是否删除"+e.target.getExtData().deviceName, "提示", {
+          let diviceType = {"2":"调压箱","3":"阀门井","4":"流量计","7":"压力表",};
+          vue.$confirm('是否删除名称为"'+e.target.getExtData().deviceName+'"的'+diviceType[markerType]+" ?", "提示", {
               type: "warning"
               // center: true
             }).then(() => {
@@ -697,7 +698,7 @@ class gaodeMap {
     this.mouseTool.on("draw", function(e) {
       if (e.obj.getExtData().type != "newLine") {
         map.remove(that.markerOverlays);
-        const device = that.createInfowindow();
+        const device = that.createInfowindow("新增");
         device.map = map;
         device.obj = e.obj;
         device.gaoMap = that;
@@ -758,29 +759,29 @@ class gaodeMap {
   /**
    * 创建弹框事件
    */
-  createInfowindow() {
+  createInfowindow(val) {
     switch (this.deviceType) {
       case DEVICE_TYPE.PIPEPLINE: {
         break;
       }
       case DEVICE_TYPE.REGEULATORBOX: {
         return createPop(regulatorBox, {
-          title: "调压箱"
+          title: val+ "调压箱"
         });
       }
       case DEVICE_TYPE.VALUEWELL: {
         return createPop(valveWell, {
-          title: "阀门井"
+          title: val+ "阀门井"
         });
       }
       case DEVICE_TYPE.FLOWMETER: {
         return createPop(flowMeter, {
-          title: "流量计"
+          title: val+ "流量计"
         });
       }
       case DEVICE_TYPE.PRESSUREGAGE: {
         return createPop(flowMeter, {
-          title: "压力表"
+          title: val+ "压力表"
         });
       }
     }