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/devices/monitor-point/monitor-point.component.ts | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/app/routes/devices/monitor-point/monitor-point.component.ts b/src/app/routes/devices/monitor-point/monitor-point.component.ts index 6892d0e..b24c84c 100644 --- a/src/app/routes/devices/monitor-point/monitor-point.component.ts +++ b/src/app/routes/devices/monitor-point/monitor-point.component.ts @@ -123,7 +123,8 @@ if (d != null) { Object.assign(data, d); } - const configMap = this.queryMap; + let configMap = {}; + configMap = Object.assign(configMap, this.queryMap); this.modalHelper.static(MonitorPointEditComponent, { data, configMap }).subscribe( (ret: { data: any, close: Function }) => { // ������������ -- Gitblit v1.8.0