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/sensors/basic-info/basic-info.component.ts |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/app/routes/sensors/basic-info/basic-info.component.ts b/src/app/routes/sensors/basic-info/basic-info.component.ts
index e53d4f6..491aa4f 100644
--- a/src/app/routes/sensors/basic-info/basic-info.component.ts
+++ b/src/app/routes/sensors/basic-info/basic-info.component.ts
@@ -7,6 +7,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Subject } from 'rxjs/Subject';
 import { SensorEditComponent } from './sensor-edit/sensor-edit.component';
+import { SensorUnitComponent } from './sensor-unit/sensor-unit.component';
 
 
 
@@ -27,7 +28,7 @@
         text: '������',
         width: '200px'  
       },
-      key: {
+      sensorKey: {
         text: '������',
         width: '60px'  
       },
@@ -171,5 +172,15 @@
      }
      this.load();
   }
+  configSensorUnit(d) {
+    const data = {};
+    if ( d != null) {
+      Object.assign(data, d);
+    }
+    this.modalHelper.static(SensorUnitComponent, { data }).subscribe(
+      res => {
 
+      }
+    );
+  }
 }

--
Gitblit v1.8.0