From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/systems/organization/organization-config/organization-config.component.ts | 4 ++--
1 files changed, 2 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 607f51d..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;
@@ -183,7 +183,7 @@
result => {
if (result != null && result.code === 1) {
this.msgSrv.success(this.organization.name + ' ���������������');
- this.backToList();
+ // this.backToList();
}
}
);
--
Gitblit v1.8.0