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",