Merge remote-tracking branch 'origin/master'

gassafety-web/src/components/mapDialog/checkDeviceLoaction.vue

@@ -2,8 +2,7 @@
   <el-dialog
     title="拾取坐标"
     :visible.sync="dialogTableVisible"
-    :show-close="false"
-    :close-on-click-modal="false"
+    :before-close="handleClose"
   >
 
     <el-row class="lt">
@@ -112,6 +111,9 @@
           //同Marker的Option设置
         });
       },
+      handleClose(){
+        this.$emit('dialogcancelFun');
+      },
       search(){
         this.placeSearch.search(this.keyWorld);  //关键字查询查询
       }

gassafety-web/src/components/mapDialog/checkPipeLineLocation.vue

@@ -2,8 +2,7 @@
   <el-dialog
     title="拾取坐标"
     :visible.sync="dialogTableVisible"
-    :show-close="false"
-    :close-on-click-modal="false"
+    :before-close="handleClose"
   >
     <div style="postion:relative">
       <el-row :span="8" class="button">
@@ -89,6 +88,9 @@
       search(){
         this.placeSearch.search(this.keyWorld);  //关键字查询查询
       },
+      handleClose(){
+        this.$emit('dialogcancelFun');
+      },
       barClose() {
         console.log("window");
         this.deviceType = false;