From 2ea3b1a95efc140e43734437cc16fc7f6240b9bd Mon Sep 17 00:00:00 2001
From: Kxc0822a <kxc000822>
Date: 星期四, 31 三月 2022 09:12:41 +0800
Subject: [PATCH] 重大

---
 src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue |   52 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 85789ba..050e4da 100644
--- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
+++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
@@ -74,6 +74,7 @@
                 :page-size="pageSize"
                 layout="total, sizes, prev, pager, next, jumper"
                 :total="recordTotal"
+                style="margin-top: 20px;"
             >
             </el-pagination>
         </div>
@@ -113,6 +114,7 @@
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value"
+                                    @change="statusChange"
                                 >
                                 </el-option>
                             </el-select>
@@ -193,17 +195,27 @@
                 rules: {
                     equipmentId: { required: true, message: "请选择设备名称", trigger: "change"},
                     status: { required: true, message: "请选择设备状态", trigger: "change"},
-                    alarmTime: { required: true, message: "请选择报警事件", trigger: "change"},
+                    alarmTime: { required: true, message: "请选择报警时间", trigger: "change"},
                     alarmInfo: { required: true, message: "请输入报警信息", trigger: "change"},
                 },
                 equipmentName:[],
-                unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}]
+                unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}],
             };
         },
         created() {
             this.elementManagementL();
+            this.alarmMajorEquipmentErt();
         },
         methods: {
+            alarmMajorEquipmentErt(){
+                majorEquipmentErt().then(res=>{
+                    console.log(res)
+                    this.equipmentName=res.data.result
+                })
+            },
+            statusChange(e){
+                this.$forceUpdate()
+            },
             async elementManagementL() {
                 var res = await majorEquipmentList(this.listQuery);
                 console.log(res);
@@ -219,10 +231,6 @@
                 this.$nextTick(() => {
                     this.$refs["form"].clearValidate();
                 });
-                majorEquipmentErt().then(res=>{
-                    console.log(res)
-                    this.equipmentName=res.data.result
-                })
                 if (type == "新增") {
                     this.title = "新增";
                     this.form = {
@@ -252,6 +260,7 @@
                                         title: "成功",
                                     });
                                 } else {
+                                    this.elementManagementL();
                                     this.$message({
                                         type: "warning",
                                         message: res.data.message,
@@ -269,8 +278,9 @@
                                         message: "编辑成功",
                                         title: "成功",
                                     });
-                                } else {
-                                    his.$message({
+                                }else {
+                                    this.elementManagementL();
+                                    this.$message({
                                         type: "warning",
                                         message: res.data.message,
                                     });
@@ -286,17 +296,21 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 })
-                majorEquipmentDel({id:val}).then((res) => {
-                    if (res.data.code == 200) {
-                        this.elementManagementL();
-                        this.$notify({
-                            title: "成功",
-                            message: "删除成功",
-                            type: "success",
-                            duration: 2000,
-                        });
-                    }
-                });
+                    .then(()=>{
+                        majorEquipmentDel({id:val}).then((res) => {
+                            if (res.data.code == 200) {
+                                this.elementManagementL();
+                                this.$notify({
+                                    title: "成功",
+                                    message: "删除成功",
+                                    type: "success",
+                                    duration: 2000,
+                                });
+                            }
+                        })
+                    })
+                    .catch(error =>{
+                    });
             },
             find(){
                 this.elementManagementL();

--
Gitblit v1.9.2