From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/system/alarmLevels.json | 116 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 94 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index ef409bf..e32bd40 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -11,9 +11,11 @@
"enable": 1,
"increment": [
35,
+ 75,
115,
+ 150,
250
- ],
+ ],
"degressEnable": 0,
"degression": [0,0,0]
},
@@ -21,7 +23,9 @@
"enable": 1,
"increment": [
50,
+ 150,
250,
+ 350,
420
],
"degressEnable": 0,
@@ -48,11 +52,11 @@
"degression": [0,0,0]
},
"e5": {
- "enable": 0,
+ "enable": 1,
"increment": [
- 0.01,
- 0.02,
- 0.05
+ 5,
+ 6,
+ 7.5
],
"degressEnable": 0,
"degression": [0,0,0]
@@ -72,7 +76,7 @@
"increment": [
25,
30,
- 40
+ 60
],
"degressEnable": 0,
"degression": [0,0,0]
@@ -88,11 +92,11 @@
"degression": [0,0,0]
},
"e9": {
- "enable": 0,
+ "enable": 1,
"increment": [
- 0.01,
- 0.02,
- 0.03
+ 3000,
+ 3600,
+ 4500
],
"degressEnable": 0,
"degression": [0,0,0]
@@ -100,9 +104,11 @@
"e10": {
"enable": 1,
"increment": [
- 2,
- 14,
- 36
+ 5,
+ 10,
+ 35,
+ 60,
+ 90
],
"degressEnable": 0,
"degression": [0,0,0]
@@ -110,8 +116,10 @@
"e11": {
"enable": 1,
"increment": [
- 50,
- 475,
+ 150,
+ 500,
+ 650,
+ 800,
1600
],
"degressEnable": 0,
@@ -138,11 +146,11 @@
"degression": [0,0,0]
},
"e14": {
- "enable": 0,
+ "enable": 1,
"increment": [
- 100,
- 200,
- 300
+ 10000,
+ 12000,
+ 15000
],
"degressEnable": 0,
"degression": [0,0,0]
@@ -151,7 +159,9 @@
"enable": 1,
"increment": [
160,
+ 200,
300,
+ 400,
800
],
"degressEnable": 0,
@@ -160,9 +170,11 @@
"e16": {
"enable": 1,
"increment": [
- 40,
- 180,
- 565
+ 100,
+ 200,
+ 700,
+ 1200,
+ 2340
],
"degressEnable": 0,
"degression": [0,0,0]
@@ -196,6 +208,66 @@
],
"degressEnable": 0,
"degression": [0,0,0]
+ },
+ "e21": {
+ "enable": 1,
+ "increment": [
+ 3,
+ 4,
+ 5
+ ],
+ "degressEnable": 0,
+ "degression": [0,0,0]
+ },
+ "e25": {
+ "enable": 1,
+ "increment": [
+ 41,
+ 49,
+ 62
+ ],
+ "degressEnable": 0,
+ "degression": [0,0,0]
+ },
+ "e26": {
+ "enable": 1,
+ "increment": [
+ 47,
+ 57,
+ 71
+ ],
+ "degressEnable": 0,
+ "degression": [0,0,0]
+ },
+ "e27": {
+ "enable": 1,
+ "increment": [
+ 71,
+ 86,
+ 107
+ ],
+ "degressEnable": 0,
+ "degression": [0,0,0]
+ },
+ "e29": {
+ "enable": 1,
+ "increment": [
+ 71,
+ 86,
+ 107
+ ],
+ "degressEnable": 0,
+ "degression": [0,0,0]
+ },
+ "e30": {
+ "enable": 1,
+ "increment": [
+ 84,
+ 101,
+ 126
+ ],
+ "degressEnable": 0,
+ "degression": [0,0,0]
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0