From ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 22:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/system/alarmLevels.json | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 1924afd..cd81564 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -1,18 +1,20 @@
{
"e1":{
- "level1":50,
+ "level1":35,
"level2":115,
- "level3":250
+ "level3":250,
+ "enable":1
},
"e2":{
"level1":50,
"level2":250,
- "level3":420
+ "level3":420,
+ "enable":1
},
"e3":{
"level1":5000,
"level2":8000,
- "level3":10000
+ "level3":20000
},
"e4":{
"level1":30,
@@ -47,12 +49,14 @@
"e10":{
"level1":2,
"level2":14,
- "level3":36
+ "level3":36,
+ "enable":1
},
"e11":{
"level1":0.05,
"level2":0.475,
- "level3":1.6
+ "level3":1.6,
+ "enable":1
},
"e12":{
"level1":10000,
@@ -70,14 +74,16 @@
"level3":6
},
"e15":{
- "level1":0.3,
- "level2":0.5,
- "level3":0.8
+ "level1":0.16,
+ "level2":0.3,
+ "level3":0.8,
+ "enable":1
},
"e16":{
"level1":0.04,
"level2":0.18,
- "level3":0.565
+ "level3":0.565,
+ "enable":1
},
"e17":{
"level1":1,
--
Gitblit v1.8.0