From 6efb2a0076a544b5714bccba214d81904264540d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 08:49:31 +0800
Subject: [PATCH] 报表展示 增加镇村选项

---
 src/app/routes/reports/demo/demo.component.ts   |   76 +++++++++++++++++++++++++++++++++----
 src/app/routes/reports/demo/demo.component.html |    4 +-
 2 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html
index 5114441..ea195e5 100644
--- a/src/app/routes/reports/demo/demo.component.html
+++ b/src/app/routes/reports/demo/demo.component.html
@@ -76,10 +76,10 @@
 			<div nz-col [nzSpan]="5" class="mb-md">
 				<div nz-form-item class="d-flex">
 					<div nz-form-label class="label-width-70">
-						<label nz-form-item-required>���������</label>
+						<label nz-form-item-required>������</label>
 					</div>
 					<div nz-form-control class="flex-1">
-                        <nz-cascader [nzSize]="'large'" (nzLoad)="areaLazyLoad($event,i)" [nzPlaceHolder]="'��������� ���/���/���'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event,i)">
+                        <nz-cascader [nzSize]="'large'" (nzLoad)="areaLazyLoad($event,i)" [nzPlaceHolder]="'��������� ���/���/���/���/���'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event,i)">
                         </nz-cascader>
 					</div>
 				</div>
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 50cbc76..6622aef 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -51,7 +51,39 @@
   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,
@@ -159,36 +191,52 @@
         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(
           (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) {
+        console.info(event);
+
     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,8 +249,18 @@
         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.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