From 1cbd89e5aceb71e990c42b8599e45f2703588878 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 06 Nov 2017 13:39:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/system/alarmLevels.json | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 3889874..5ff876f 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -10,39 +10,39 @@
"level3":420
},
"e3":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":2000,
+ "level2":5000,
+ "level3":8000
},
"e4":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":10,
+ "level2":30,
+ "level3":60
},
"e5":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":0.01,
+ "level2":0.02,
+ "level3":0.05
},
"e6":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":60,
+ "level2":100,
+ "level3":160
},
"e7":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":35,
+ "level2":30,
+ "level3":40
},
"e8":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":30,
+ "level2":40,
+ "level3":50
},
"e9":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":0.01,
+ "level2":0.02,
+ "level3":0.03
},
"e10":{
"level1":2,
@@ -55,9 +55,9 @@
"level3":1.6
},
"e12":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":10000,
+ "level2":15000,
+ "level3":25000
},
"e13":{
"level1":30,
@@ -65,9 +65,9 @@
"level3":90
},
"e14":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":2,
+ "level2":4,
+ "level3":6
},
"e15":{
"level1":0.16,
@@ -80,18 +80,18 @@
"level3":0.565
},
"e17":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":1,
+ "level2":2,
+ "level3":5
},
"e18":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":5,
+ "level2":6,
+ "level3":8
},
"e19":{
- "level1":0,
- "level2":0,
- "level3":0
+ "level1":480,
+ "level2":580,
+ "level3":680
}
}
\ No newline at end of file
--
Gitblit v1.8.0