From fbb41565ad27f1cbdc613a3ae6bc2a48ff6250ea Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Thu, 18 May 2023 17:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8A=A5=E8=AD=A6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipment/warnHistory.vue | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/views/equipment/warnHistory.vue b/src/views/equipment/warnHistory.vue
index e43a7a8..3449bbd 100644
--- a/src/views/equipment/warnHistory.vue
+++ b/src/views/equipment/warnHistory.vue
@@ -65,8 +65,8 @@
 
 	var DIC = {
 		alarmType: [{
-			label: '无报警',
-			value: 0
+			label: '未知',
+			value: -1
 		},{
 			label: '事件报警',
 			value: 1
@@ -74,6 +74,13 @@
 			label: '设备报警',
 			value: 2
 		}],
+		statusType:[{
+			label:'报警中',
+			value:1
+		},{
+			label:'已恢复',
+			value:2
+		}],
 		aereaType:[{
 			label:'业务区',
 			value:'1'
@@ -82,6 +89,9 @@
 			value:'2'
 		}],
 		recoveryType:[{
+			label: ' ',
+			value: -1
+		},{
 			label: '手动',
 			value: 1
 		}, {
@@ -159,6 +169,13 @@
 							dicData: DIC.alarmType,
 							align:'center',
 						},
+						{
+							label: "报警状态",
+							prop: "status",
+							type:"select",
+							dicData: DIC.statusType,
+							align:'center',
+						},
 						{
 							label: "报警时间",
 							prop: "warnDate",