From 8ac3a87733b421c1f1cb3b691f946c05bdae02df Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:54:14 +0800
Subject: [PATCH] 设备,监控点维护 完善
---
src/app/routes/reports/demo/demo.component.ts | 38 +++-----------------------------------
1 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 547e6a1..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);
});
@@ -259,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