From 6cda1fb9d6c914b3dd985b8dceb911533f52e241 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 31 三月 2022 14:23:26 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

---
 src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue      |    5 +----
 src/views/majorHazardSourceMonitoring/productionEquipment/index.vue |    1 +
 src/views/safetyproduction/feature.vue                              |    1 +
 src/views/majorHazardSourceMonitoring/instrumentData/index.vue      |    1 +
 src/views/contingencyplan/index.vue                                 |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/contingencyplan/index.vue b/src/views/contingencyplan/index.vue
index eadfaf8..ff3fd23 100644
--- a/src/views/contingencyplan/index.vue
+++ b/src/views/contingencyplan/index.vue
@@ -57,7 +57,7 @@
       style="text-align: right;margin-top: 20px;"
     >
     </el-pagination>
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="40%">
+    <el-dialog :title="title" :visible.sync="dialogVisible":close-on-click-modal="false" width="40%">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="预案名称" prop="name">
           <el-input v-model="form.name"></el-input>
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 5a4fd77..97e7aad 100644
--- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
+++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
@@ -81,6 +81,7 @@
         <el-dialog
             :title="title"
             :visible.sync="dialogVisible"
+            :close-on-click-modal="false"
             width="40%"
         >
             <el-form ref="form" :rules="rules" :model="form" label-width="80px">
@@ -114,7 +115,6 @@
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value"
-                                    @change="statusChange"
                                 >
                                 </el-option>
                             </el-select>
@@ -212,9 +212,6 @@
                     console.log(res)
                     this.equipmentName=res.data.result
                 })
-            },
-            statusChange(e){
-                this.$forceUpdate()
             },
             async elementManagementL() {
                 var res = await majorEquipmentList(this.listQuery);
diff --git a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
index 09f6c2f..1d70796 100644
--- a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
+++ b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
@@ -70,6 +70,7 @@
         <el-dialog
             :title="title"
             :visible.sync="dialogVisible"
+            :close-on-click-modal="false"
             width="40%"
         >
             <el-form ref="form" :rules="rules" :model="form" label-width="120px">
diff --git a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
index 0c4be72..a2d0b13 100644
--- a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
+++ b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
@@ -80,6 +80,7 @@
         <el-dialog
             :title="title"
             :visible.sync="dialogVisible"
+            :close-on-click-modal="false"
             width="40%"
         >
             <el-form ref="form" :rules="rules" :model="form" label-width="80px">
diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index 4872385..442f961 100644
--- a/src/views/safetyproduction/feature.vue
+++ b/src/views/safetyproduction/feature.vue
@@ -74,6 +74,7 @@
     <el-dialog
       :title="title"
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       width="40%"
     >
       <el-form ref="form" :rules="rules" :model="form" label-width="80px">

--
Gitblit v1.9.2