From ad42a81e625f1e7a982a94994d7d5f3314c71fbd Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 15 Nov 2017 14:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/system/alarmLevels.json | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 9b402dc..88e94de 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -12,39 +12,46 @@
"enable":1
},
"e3":{
- "level1":5000,
- "level2":8000,
- "level3":20000
+ "level1":20000,
+ "level2":30000,
+ "level3":40000,
+ "enable":0
},
"e4":{
"level1":30,
- "level2":60,
- "level3":100
+ "level2":75,
+ "level3":100,
+ "enable":0
},
"e5":{
"level1":0.01,
"level2":0.02,
- "level3":0.05
+ "level3":0.05,
+ "enable":0
},
"e6":{
"level1":60,
"level2":100,
- "level3":160
+ "level3":160,
+ "enable":0
},
"e7":{
"level1":35,
"level2":30,
- "level3":40
+ "level3":40,
+ "enable":0
},
"e8":{
"level1":30,
"level2":40,
- "level3":50
+ "level3":50,
+ "enable":0
},
"e9":{
"level1":0.01,
"level2":0.02,
- "level3":0.03
+ "level3":0.03,
+ "enable":0
},
"e10":{
"level1":2,
@@ -61,17 +68,20 @@
"e12":{
"level1":10000,
"level2":15000,
- "level3":20000
+ "level3":20000,
+ "enable":0
},
"e13":{
"level1":60,
"level2":90,
- "level3":120
+ "level3":120,
+ "enable":0
},
"e14":{
- "level1":2,
- "level2":4,
- "level3":6
+ "level1":100,
+ "level2":200,
+ "level3":300,
+ "enable":0
},
"e15":{
"level1":160,
@@ -86,18 +96,21 @@
"enable":1
},
"e17":{
- "level1":1,
- "level2":2,
- "level3":5
+ "level1":1.5,
+ "level2":3,
+ "level3":5,
+ "enable":0
},
"e18":{
"level1":5,
"level2":6,
- "level3":8
+ "level3":8,
+ "enable":0
},
"e19":{
- "level1":800,
- "level2":1200,
- "level3":1600
+ "level1":3000,
+ "level2":4000,
+ "level3":5000,
+ "enable":0
}
}
\ No newline at end of file
--
Gitblit v1.8.0