Merge remote-tracking branch 'origin/master'

gassafetyprogress-web/src/views/emergency/index.vue

@@ -186,7 +186,7 @@
           <div class="el-form-div">
             <el-input v-model="form.longitude" placeholder="请输入经度" style="width: 120px" :disabled="readonly"/>
             <el-input v-model="form.latitude" placeholder="请输入纬度" style="width: 120px;margin-left: 10px;" :disabled="readonly"/>
-            <el-button type="primary" style="margin-left: 10px;" plain @click="MapdialogFun">选择经纬度</el-button>
+            <el-button type="primary"  :style="buttonstyle" plain @click="MapdialogFun">选择经纬度</el-button>
           </div>
 
         </el-form-item>
@@ -293,6 +293,7 @@ export default {
       eventGradeOptions: [],
       // 弹出层标题
       title: "",
+      buttonstyle:"display:none",
       //选择经纬度
       dialogTableVisible:false,
       devicePos:[],
@@ -562,6 +563,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加事件接报";
+      this.buttonstyle="margin-left:10px"
     },
     qiyechang(value){
       let obj = {};
@@ -574,12 +576,14 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.readonly=true;
+      this.buttonstyle="display:none";
       this.reset();
       const id = row.id || this.ids
       getReceive(id).then(response => {
         this.form = response.data;
       this.open = true;
       this.title = "修改事件接报";
+      document.getElementById("jingwei").style.display="none";
     });
     },
     /** 提交按钮 */