From a52dc7a6e7119d575c611f9c2800649dff029f5e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 09:29:25 +0800
Subject: [PATCH] 大屏布局
---
src/app/routes/systems/organization/organization-config/organization-config.component.ts | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/systems/organization/organization-config/organization-config.component.ts b/src/app/routes/systems/organization/organization-config/organization-config.component.ts
index 9919313..fe80593 100644
--- a/src/app/routes/systems/organization/organization-config/organization-config.component.ts
+++ b/src/app/routes/systems/organization/organization-config/organization-config.component.ts
@@ -57,7 +57,7 @@
alarmConfig = this.alarmConfigService.generateAlarmConfig(pageBean.data);
} else {
// ������ ������ ���������
- alarmConfig = this.alarmConfigService.generateAlarmConfig(pageBean.data, resultBean.data);
+ alarmConfig = this.alarmConfigService.generateAlarmConfig(pageBean.data, <AlarmConfig>resultBean.data);
}
const alarmConfigValue = alarmConfig.value;
@@ -114,6 +114,7 @@
alarmMode: this.formBuilder.group(
{
enable: [alarmMode.enable],
+ interval: [alarmMode.interval],
level1: [alarmMode.level1],
level2: [alarmMode.level2],
level3: [alarmMode.level3]
@@ -182,7 +183,7 @@
result => {
if (result != null && result.code === 1) {
this.msgSrv.success(this.organization.name + ' ���������������');
- this.backToList();
+ // this.backToList();
}
}
);
@@ -288,4 +289,6 @@
);
}
}
+ // ���������
+ parserInt = (value) => parseInt(value , 10);
}
--
Gitblit v1.8.0