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 | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 050e4da..97e7aad 100644
--- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
+++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
@@ -36,8 +36,8 @@
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
- <span v-if="scope.row.status == 0">已处理</span>
- <span v-if="scope.row.status == 1">未处理</span>
+ <span v-if="scope.row.status == 0">未处理</span>
+ <span v-if="scope.row.status == 1">已处理</span>
</template>
</el-table-column>
<el-table-column prop="alarmTime" label="报警时间" align="center">
@@ -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>
@@ -153,7 +153,7 @@
<el-button type="primary" class="btns" @click="AddelementManagement()"
>确 定</el-button
>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -213,9 +213,6 @@
this.equipmentName=res.data.result
})
},
- statusChange(e){
- this.$forceUpdate()
- },
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
console.log(res);
@@ -260,11 +257,6 @@
title: "成功",
});
} else {
- this.elementManagementL();
- this.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
} else {
@@ -279,17 +271,16 @@
title: "成功",
});
}else {
- this.elementManagementL();
- this.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
}
}
});
},
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false
+ },
deleteById(val) {
this.$confirm('确认删除吗','提示', {
confirmButtonText: '确认',
--
Gitblit v1.9.2