From 1fce0b643b1b8bd5d443efb3ff0074caab3c5dba Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Thu, 31 Mar 2022 17:07:56 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 6f82523..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>
@@ -212,9 +212,6 @@
console.log(res)
this.equipmentName=res.data.result
})
- },
- statusChange(e){
- this.$forceUpdate()
},
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
--
Gitblit v1.9.2