地图模式图片上传bug

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

@@ -151,6 +151,7 @@ export default {
     return {
       form: {
         deviceType: "3",
+        iconUrl:"",
       },
       type: DEVICE_TYPE.FLOWMETER,
       dialogVisible: false,

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

@@ -3,6 +3,7 @@
     :title="myTitle"
     :visible.sync="dialogVisible"
     :before-close="handleClose"
+    ref="dialog"
   >
     <el-row>
       <el-form
@@ -146,7 +147,7 @@
       <el-button :loading="okLoading" type="primary" @click="ok"
         >确 定</el-button
       >
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="handleCloseBtn">取 消</el-button>
     </span>
   </el-dialog>
 </template>
@@ -271,14 +272,19 @@ export default {
               if (res.code == 200) {
                 this.dialogVisible = false;
                 data.pipeId = data.pipeId ? data.pipeId : res.data;
-                this.lineOkCallBack.call(this.gaodeMap, this.target, data,()=>{
-                  const arr= this.gaodeMap.polyLines.map(item=>{
-                    return item.getExtData().lineData
-                  })
-                  console.log("arr===================",arr)
-                  this.gaodeMap.view.pipeClassify(arr)
-                  this.gaodeMap.view.pipeList();
-                });
+                this.lineOkCallBack.call(
+                  this.gaodeMap,
+                  this.target,
+                  data,
+                  () => {
+                    const arr = this.gaodeMap.polyLines.map((item) => {
+                      return item.getExtData().lineData;
+                    });
+                    console.log("arr===================", arr);
+                    this.gaodeMap.view.pipeClassify(arr);
+                    this.gaodeMap.view.pipeList();
+                  }
+                );
                 if (!this.editForm.pipeId) {
                   this.gaodeMap.newLineObj = null;
                   this.gaodeMap.createNewLine();
@@ -321,7 +327,9 @@ export default {
       options.lineData = { ...this.editForm };
       this.target.setExtData(options);
       // 把值带出去
-      done();
+      if (done) {
+        done();
+      }
 
       // this.$confirm("确认关闭？")
       //   .then((_) => {
@@ -329,6 +337,10 @@ export default {
       //   })
       //   .catch((_) => {});
     },
+    handleCloseBtn() {
+      this.handleClose();
+      this.dialogVisible = false;
+    },
     // 图片上传成功
     fileFinshed(e) {
       this.editForm.iconUrl = e.url;

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

@@ -151,6 +151,8 @@ export default {
     return {
       form: {
         deviceType: "4",
+        iconUrl:"",
+
       },
       type: DEVICE_TYPE.PRESSUREGAGE,
       dialogVisible: false,

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

@@ -151,6 +151,8 @@ export default {
     return {
       form: {
         deviceType: "1",
+        iconUrl:"",
+
       },
       type: DEVICE_TYPE.REGEULATORBOX,
       dialogVisible: false,

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

@@ -150,6 +150,7 @@ export default {
     return {
       form: {
         deviceType: "2",
+        iconUrl:"",
       },
       type: DEVICE_TYPE.VALUEWELL,
       dialogVisible: false,