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/reports/demo/demo.component.ts |   39 +++------------------------------------
 1 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 6622aef..c279929 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -51,39 +51,7 @@
   get sensorNames(): string {
     return this._sensorNames;
   }
-  options = [{
-  value: 'zhejiang',
-  label: 'Zhejiang',
-  children: [{
-    value: 'hangzhou',
-    label: 'Hangzhou',
-    children: [{
-      value: 'xihu',
-      label: 'West Lake',
-      isLeaf: true
-    }]
-  }, {
-    value: 'ningbo',
-    label: 'Ningbo',
-    isLeaf: true
-  }]
-}, {
-  value: 'jiangsu',
-  label: 'Jiangsu',
-  children: [{
-    value: 'nanjing',
-    label: 'Nanjing',
-    children: [{
-      value: 'zhonghuamen',
-      label: 'Zhong Hua Men',
-      children: [{
-      value: 'zhonghuamen12',
-      label: 'Zhong Hua Men12',
-      isLeaf: true
-    }]
-    }]
-  }]
-}];
+
   constructor(
     public http: HttpClient,
     public dateSrv: DateService,
@@ -200,7 +168,7 @@
           });
          break;
       case 1:
-        this.areacodeService.getAreas(option.value).subscribe(
+        this.areacodeService.getAreas(option.value,false).subscribe(
           (res: {label: string, value: string}[]) => {
             event.resolve(res);
           }); 
@@ -221,7 +189,6 @@
   }
 
   public regionChange(event: {option: CascaderOption, index: number}, i) {
-        console.info(event);
 
     let name = '';
     let areaName = '';
@@ -260,7 +227,7 @@
         areaName = option.parent.parent.parent.parent.label + '/' + option.parent.parent.parent.label + '/' + option.parent.parent.label + '/' + option.parent.label + '/' + option.label;
         break;
     }
-    //this.items[i].areaName = areaName;
+    this.items[i].areaName = areaName;
     this.http.get(environment.SERVER_BASH_URL + 'monitor-point/list/region', {params: {name: name, value: option.value}}).subscribe((res: any) => {
       if (res.code === 0) {
         this.msgSrv.error(res.message);

--
Gitblit v1.8.0