From af95e3f15895995607604ecf0e757c48169795b3 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 05 Jul 2018 15:00:27 +0800
Subject: [PATCH] 修复 区域为空拼接问题
---
src/app/routes/reports/demo/demo.component.ts | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 50cbc76..c279929 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -159,36 +159,51 @@
this.areacodeService.getProvinces().subscribe(
(res: {label: string, value: string}[]) => {
event.resolve(res);
- }
- ); break;
+ });
+ break;
case 0:
this.areacodeService.getCities(option.value).subscribe(
(res: {label: string, value: string}[]) => {
event.resolve(res);
- }
- ); break;
+ });
+ break;
case 1:
- this.areacodeService.getAreas(option.value).subscribe(
+ this.areacodeService.getAreas(option.value,false).subscribe(
(res: {label: string, value: string}[]) => {
event.resolve(res);
- }
- ); break;
+ });
+ break;
+ case 2:
+ this.areacodeService.getTowns(option.value).subscribe(
+ (res: {label: string, value: string}[]) => {
+ event.resolve(res);
+ });
+ break;
+ case 3:
+ this.areacodeService.getVillages(option.value).subscribe(
+ (res: {label: string, value: string}[]) => {
+ event.resolve(res);
+ });
+ break;
}
}
public regionChange(event: {option: CascaderOption, index: number}, i) {
+
let name = '';
let areaName = '';
const option = event.option;
this.items[i].monitorPoint = null;
//this.items[i].profession = null;
+ this.items[i].cityCode = null;
this.items[i].areaCode = null;
+ this.items[i].townCode = null;
+ this.items[i].villageCode = null;
switch (event.index) {
case 0:
name = 'provinceCode';
this.items[i].provinceCode = option.value;
- this.items[i].cityCode = null;
areaName = option.label;
break;
case 1:
@@ -201,6 +216,16 @@
this.items[i].areaCode = option.value;
areaName = option.parent.parent.label + '/' + option.parent.label + '/' + option.label;
break;
+ case 3:
+ name = 'townCode';
+ this.items[i].townCode = option.value;
+ areaName = option.parent.parent.parent.label + '/' + option.parent.parent.label + '/' + option.parent.label + '/' + option.label;
+ break;
+ case 4:
+ name = 'villageCode';
+ this.items[i].villageCode = option.value;
+ 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.http.get(environment.SERVER_BASH_URL + 'monitor-point/list/region', {params: {name: name, value: option.value}}).subscribe((res: any) => {
--
Gitblit v1.8.0