From 906e819de11a4f2a47545aff9fc551abd811adb5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 09 Jun 2018 12:16:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/system/alarmLevels.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index ef409bf..4d9dddd 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -50,9 +50,9 @@
"e5": {
"enable": 0,
"increment": [
- 0.01,
- 0.02,
- 0.05
+ 0.1,
+ 0.5,
+ 1
],
"degressEnable": 0,
"degression": [0,0,0]
@@ -72,7 +72,7 @@
"increment": [
25,
30,
- 40
+ 60
],
"degressEnable": 0,
"degression": [0,0,0]
@@ -90,9 +90,9 @@
"e9": {
"enable": 0,
"increment": [
- 0.01,
- 0.02,
- 0.03
+ 100,
+ 500,
+ 1000
],
"degressEnable": 0,
"degression": [0,0,0]
--
Gitblit v1.8.0