From fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 30 Mar 2022 16:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 85789ba..8b80821 100644
--- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
+++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
@@ -193,7 +193,7 @@
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:[],
@@ -202,8 +202,15 @@
},
created() {
this.elementManagementL();
+ this.alarmMajorEquipmentErt();
},
methods: {
+ alarmMajorEquipmentErt(){
+ majorEquipmentErt().then(res=>{
+ console.log(res)
+ this.equipmentName=res.data.result
+ })
+ },
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
console.log(res);
@@ -219,10 +226,6 @@
this.$nextTick(() => {
this.$refs["form"].clearValidate();
});
- majorEquipmentErt().then(res=>{
- console.log(res)
- this.equipmentName=res.data.result
- })
if (type == "新增") {
this.title = "新增";
this.form = {
@@ -286,17 +289,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