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/basic-info/basic-info.component.ts | 5 ++---
src/app/routes/devices/monitor-point/monitor-point.component.ts | 3 ++-
src/app/routes/devices/basic-info/device-edit/device-edit.component.ts | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/devices/basic-info/basic-info.component.ts b/src/app/routes/devices/basic-info/basic-info.component.ts
index 6dabdca..3833c79 100644
--- a/src/app/routes/devices/basic-info/basic-info.component.ts
+++ b/src/app/routes/devices/basic-info/basic-info.component.ts
@@ -122,12 +122,10 @@
this.deviceService.countByExample(example).subscribe(
res => {
if (!!res && !!res.code) {
- setTimeout(() => {
const count = res.data;
const pages = Math.ceil(count / this.simpleTable.ps);
const pi = this.simpleTable.pi > pages ? pages : this.simpleTable.pi;
this.simpleTable.load(pi);
- }, 1);
}
}
);
@@ -180,7 +178,8 @@
if (d != null) {
Object.assign(data, d);
}
- const configMap = this.queryMap;
+ let configMap = {};
+ configMap = Object.assign(configMap, this.queryMap);
// Object.assign(configMap, this.queryMap);
if (!!configMap['mpointId'] && !d['monitorPoint']) {
data['monitorPoint'] = this.getMonitorPoint(configMap['mpointId']);
diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
index f6f821c..2c35a62 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
@@ -43,7 +43,7 @@
orgId: number = null;
validateForm: FormGroup;
ngOnInit() {
- console.log(this.configMap);
+ // console.log(this.configMap);
if (!!this.data) {
Object.assign(this.originalData, this.data);
}
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