Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-02-02 e3f745b1839f3c3c8be58efb7b81681f4f2d2e4c

 src/app/business/services/http/alarm-config.service.ts

@@ -29,6 +29,7 @@
                {
                  enable: false,
                  increment: [0,0,0],
                  degressEnable: false,
                  degression:  [0,0,0]
                } : alarmLevels[key];
             }