From 45be44fb95325305373647231ef74e72d1501f8c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 08:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/system/alarmLevels.json | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index f2ebecb..25bfccb 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -12,9 +12,9 @@
"enable":1
},
"e3":{
- "level1":5000,
- "level2":8000,
- "level3":10000
+ "level1":20000,
+ "level2":30000,
+ "level3":40000
},
"e4":{
"level1":30,
@@ -53,9 +53,9 @@
"enable":1
},
"e11":{
- "level1":0.05,
- "level2":0.475,
- "level3":1.6,
+ "level1":50,
+ "level2":475,
+ "level3":1600,
"enable":1
},
"e12":{
@@ -69,20 +69,20 @@
"level3":120
},
"e14":{
- "level1":2,
- "level2":4,
- "level3":6
+ "level1":100,
+ "level2":200,
+ "level3":300
},
"e15":{
- "level1":0.16,
- "level2":0.3,
- "level3":0.8,
+ "level1":160,
+ "level2":300,
+ "level3":800,
"enable":1
},
"e16":{
- "level1":0.04,
- "level2":0.18,
- "level3":0.565,
+ "level1":40,
+ "level2":180,
+ "level3":565,
"enable":1
},
"e17":{
@@ -96,8 +96,8 @@
"level3":8
},
"e19":{
- "level1":800,
- "level2":1200,
- "level3":1600
+ "level1":3000,
+ "level2":4000,
+ "level3":5000
}
}
\ No newline at end of file
--
Gitblit v1.8.0