From 27bd4a08bf807f4f6132bb524da33490b6d22f87 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 19 Jun 2018 11:45:11 +0800
Subject: [PATCH] 省市区兼容旧版本
---
/dev/null | 6 ------
src/app/business/services/http/areacode.service.ts | 4 ++--
src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts | 0
src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts | 5 +++--
src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html | 3 +++
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/app/business/services/http/areacode.service.ts b/src/app/business/services/http/areacode.service.ts
index 54b4e2f..c6e9d7d 100644
--- a/src/app/business/services/http/areacode.service.ts
+++ b/src/app/business/services/http/areacode.service.ts
@@ -34,13 +34,13 @@
}
);
}
- getAreas(cityCode: string): Observable<{label: string, value: string}[]> {
+ getAreas(cityCode: string, isLeaf ?: Boolean): Observable<{label: string, value: string}[]> {
return this.http.get( this.baseUrl + '/area/get-areas', {cityCode: cityCode}).map(
(res: {code: number, data: any}) => {
let areas = [];
if (res !== null && res['code'] === 1 ) {
areas = res['data'].map((item) => {
- return {label: item.areaName , value: item.areaCode};
+ return {label: item.areaName , value: item.areaCode, isLeaf: isLeaf === undefined ? true : isLeaf};
});
}
return areas;
diff --git a/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts b/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
index 6cee432..826af7e 100644
--- a/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
+++ b/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
@@ -77,7 +77,7 @@
}
}
areaLazyLoad(event: { option: CascaderOption, index: number, resolve: (children: CascaderOption[]) => void, reject: () => void }) {
- console.info(event);
+ // console.info(event);
const index = event['index'];
const option = event.option;
switch (index) {
@@ -94,7 +94,8 @@
}
); break;
case 1:
- this.areacodeService.getAreas(option.value).subscribe(
+ // ������������������ ���������������
+ this.areacodeService.getAreas(option.value , false).subscribe(
(res: {label: string, value: string}[]) => {
event.resolve( res );
}
diff --git a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html
new file mode 100644
index 0000000..11b8126
--- /dev/null
+++ b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html
@@ -0,0 +1,3 @@
+<div class="modal-header">
+ <div class="modal-title">������-���������������</div>
+</div>
diff --git a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit/sensor-unit.component.ts b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts
similarity index 100%
rename from src/app/routes/sensors/basic-info/sensor-unit/sensor-unit/sensor-unit.component.ts
rename to src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts
diff --git a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit/sensor-unit.component.html b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit/sensor-unit.component.html
deleted file mode 100644
index 05ff1c6..0000000
--- a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit/sensor-unit.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="modal-header">
- <div class="modal-title">������-���������������</div>
-</div>
-<form [formGroup]="validateForm" (ngSubmit)="save($event,validateForm.value,validateForm.valid)" nz-form [nzType]="'horizontal'">
-
-</form>
--
Gitblit v1.8.0