From 50098f48234b6d53edfdac541b08a95d9d8e63d6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 04 Jun 2018 11:39:31 +0800
Subject: [PATCH] 登录页面 不处理登录失效响应
---
src/app/business/services/http/alarm-config.service.ts | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/app/business/services/http/alarm-config.service.ts b/src/app/business/services/http/alarm-config.service.ts
index 9a925c2..620f69a 100644
--- a/src/app/business/services/http/alarm-config.service.ts
+++ b/src/app/business/services/http/alarm-config.service.ts
@@ -3,41 +3,43 @@
import { environment } from '@env/environment';
import { Observable } from 'rxjs/Observable';
import { ResultBean } from '@business/entity/grid';
-import { AlarmConfig, AlarmConfigValue,AlarmSensorLevel, AlarmMode } from '@business/entity/data';
+import { AlarmConfig, AlarmConfigValue, AlarmSensorLevel, AlarmMode } from '@business/entity/data';
@Injectable()
export class AlarmConfigService {
private urls = {
getByOid: environment.SERVER_BASH_URL + 'alarm-config/get-by-oid',
- save: environment.SERVER_BASH_URL + '/alarm-config/add-or-modify',
+ save: environment.SERVER_BASH_URL + 'alarm-config/add-or-modify',
};
constructor( private http: _HttpClient) {
}
- public generateAlarmConfig(sensors: {key:string} [],alarmConfig?: AlarmConfig): AlarmConfig{
- const _alarmConfig : AlarmConfig = alarmConfig==null || alarmConfig.value == null ? {value:{
- alarmLevels:null,
- alarmMode:null
- }}: alarmConfig;
+ public generateAlarmConfig(sensors: {sensorKey: string} [], alarmConfig?: AlarmConfig): AlarmConfig {
+ const _alarmConfig: AlarmConfig = alarmConfig == null || alarmConfig.value == null ? {value: {
+ alarmLevels: null,
+ alarmMode: null
+ }} : alarmConfig;
let alarmLevels = _alarmConfig.value.alarmLevels;
- alarmLevels = alarmLevels ==null ?{} :alarmLevels;
+ alarmLevels = alarmLevels == null ? {} : alarmLevels;
sensors.forEach(
sensor => {
- const key = sensor.key;
+ const key = sensor.sensorKey;
alarmLevels[key] =
alarmLevels[key] == null ?
{
enable: false,
- increment: [0,0,0],
- degression: [0,0,0]
+ increment: [0, 0, 0],
+ degressEnable: false,
+ degression: [0, 0, 0]
} : alarmLevels[key];
}
);
_alarmConfig.value.alarmLevels = alarmLevels;
- //������������
+ // ������������
let alarmMode = _alarmConfig.value.alarmMode;
alarmMode = alarmMode == null ? {
enable: false,
+ interval: 120,
level1: null,
level2: null,
level3: null
@@ -45,8 +47,8 @@
_alarmConfig.value.alarmMode = alarmMode;
return _alarmConfig;
}
- public getByOid(oid:number):Observable<ResultBean<AlarmConfig>>{
- return this.http.get(this.urls.getByOid,{organizationId:oid});
+ public getByOid(oid: number): Observable<ResultBean<AlarmConfig>> {
+ return this.http.get(this.urls.getByOid, {organizationId: oid});
}
public save(data: any): Observable<ResultBean<any>> {
return this.http.post(this.urls.save, data);
--
Gitblit v1.8.0