From 43d81456014338d53aefc3ec81a9eafa38bf8a3f Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 02 Nov 2017 05:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/alarmLevles.json | 114 ++++++++++++++++++++++++++++----------------------------
1 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/src/main/resources/alarmLevles.json b/src/main/resources/alarmLevles.json
index 4c22080..bdbf9a7 100644
--- a/src/main/resources/alarmLevles.json
+++ b/src/main/resources/alarmLevles.json
@@ -1,97 +1,97 @@
{
"e1":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":35,
+ "level2":115,
+ "level3":250
},
"e2":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":50,
+ "level2":250,
+ "level3":420
},
"e3":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e4":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e5":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e6":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e7":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e8":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e9":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e10":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":2,
+ "level2":14,
+ "level3":36
},
"e11":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0.05,
+ "level2":0.475,
+ "level3":1.6
},
"e12":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e13":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":30,
+ "level2":50,
+ "level3":90
},
"e14":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e15":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0.16,
+ "level2":0.3,
+ "level3":0.8
},
"e16":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0.04,
+ "level2":0.18,
+ "level3":0.565
},
"e17":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e18":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e19":{
- "level1":10,
- "level2":20,
- "level3":30
+ "level1":0,
+ "level2":0,
+ "level3":0
}
}
\ No newline at end of file
--
Gitblit v1.8.0