From f0b5148973e9437f3651153e53f8f336c4c3c6ff Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/system/alarmLevels.json | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 2c4a921..dd2969e 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -88,7 +88,7 @@
"degression": [0,0,0]
},
"e9": {
- "enable": 0,
+ "enable": 1,
"increment": [
3000,
3600,
@@ -138,7 +138,7 @@
"degression": [0,0,0]
},
"e14": {
- "enable": 0,
+ "enable": 1,
"increment": [
10000,
12000,
@@ -198,7 +198,7 @@
"degression": [0,0,0]
},
"e21": {
- "enable": 0,
+ "enable": 1,
"increment": [
3,
4,
@@ -208,7 +208,7 @@
"degression": [0,0,0]
},
"e25": {
- "enable": 0,
+ "enable": 1,
"increment": [
41,
49,
@@ -218,7 +218,7 @@
"degression": [0,0,0]
},
"e26": {
- "enable": 0,
+ "enable": 1,
"increment": [
47,
57,
@@ -228,7 +228,7 @@
"degression": [0,0,0]
},
"e27": {
- "enable": 0,
+ "enable": 1,
"increment": [
71,
86,
@@ -237,8 +237,18 @@
"degressEnable": 0,
"degression": [0,0,0]
},
- "e29": {
+ "e28": {
"enable": 0,
+ "increment": [
+ 0,
+ 1000,
+ 2000
+ ],
+ "degressEnable": 0,
+ "degression": [0,0,0]
+ },
+ "e29": {
+ "enable": 1,
"increment": [
71,
86,
@@ -248,7 +258,7 @@
"degression": [0,0,0]
},
"e30": {
- "enable": 0,
+ "enable": 1,
"increment": [
84,
101,
--
Gitblit v1.8.0