From 26332c174e8e62e7e2cd5b17fe8089b9135a8b8a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 30 Mar 2018 15:04:04 +0800
Subject: [PATCH] 增加 省市区 查询条件
---
src/app/routes/reports/demo/demo.component.ts | 114 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 92 insertions(+), 22 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 431b3a2..0b66746 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -3,7 +3,11 @@
import {NzMessageService} from 'ng-zorro-antd';
import {Component, OnInit} from '@angular/core';
import {HttpClient} from '@angular/common/http';
-import {Router} from '@angular/router';
+import {CascaderOption} from 'ng-zorro-antd/src/cascader/nz-cascader.component';
+import {Organization} from '@business/entity/data';
+import {ResultCode} from '@business/enum/types.enum';
+import {ResultBean} from '@business/entity/grid';
+import {AreacodeService} from '@business/services/http/areacode.service';
@Component({
selector: 'app-demo',
@@ -25,19 +29,21 @@
{value: 'bar', label: '���������'},
{value: 'line', label: '���������'}
];
- public monitorPointOptions = [];
+
public items = [{
id: 0,
monitorPoint: null,
device: null,
time: null,
- deviceOptions: []
+ monitorPointOptions: [],
+ deviceOptions: [],
+ _areas: []
}];
constructor(
public http: HttpClient,
public dateSrv: DateService,
- public router: Router,
+ private areacodeService: AreacodeService,
public msgSrv: NzMessageService
) {
this.timeType = this.typeOptions[1];
@@ -61,23 +67,70 @@
monitorPoint: null,
device: null,
time: null,
- deviceOptions: []
+ monitorPointOptions: [],
+ deviceOptions: [],
+ _areas: []
});
}
- searchChange(searchText, i) {
- if (searchText) {
- const query = encodeURI(searchText);
- if (query) {
- this.http.get(environment.SERVER_BASH_URL + '/monitor-point/list/' + query).subscribe((res: any) => {
- if (res.code === 0) {
- this.msgSrv.error(res.message);
- } else {
- this.monitorPointOptions = res.data;
+ public areaLazyLoad(event: {option: CascaderOption, index: number, resolve: (children: CascaderOption[]) => void, reject: () => void}) {
+ const index = event['index'];
+ const option = event.option;
+ switch (index) {
+ case -1:
+ this.areacodeService.getProvinces().subscribe(
+ (res: {label: string, value: string}[]) => {
+ event.resolve(res);
}
- });
- }
+ ); break;
+ case 0:
+ this.areacodeService.getCities(option.value).subscribe(
+ (res: {label: string, value: string}[]) => {
+ event.resolve(res);
+ }
+ ); break;
+ case 1:
+ this.areacodeService.getAreas(option.value).subscribe(
+ (res: {label: string, value: string}[]) => {
+ event.resolve(res);
+ }
+ ); break;
}
+ }
+
+ public setAreasData(areas: {label: string, value: string}[], i) {
+ let isChanged = false;
+ const _areas = this.items[i]._areas
+ isChanged = areas.some((item, index: number) => {
+ // this._areas[index] ���null ������ ���������������
+ return _areas.length < areas.length
+ || !_areas[index]
+ || _areas[index].value !== item.value;
+ });
+ if (isChanged) {
+ this.items[i]._areas = areas;
+ this.items[i].monitorPoint = null;
+ this.regionChange(i);
+ }
+ }
+
+ regionChange(i) {
+ let areaName = '';
+ switch (this.items[i]._areas.length) {
+ case 1:
+ areaName = 'provinceCode'; break;
+ case 2:
+ areaName = 'cityCode'; break;
+ case 3:
+ areaName = 'areaCode'; break;
+ }
+ this.http.get(environment.SERVER_BASH_URL + 'monitor-point/list/region', {params: {name: areaName, value: this.items[i]._areas.slice(-1).pop().value}}).subscribe((res: any) => {
+ if (res.code === 0) {
+ this.msgSrv.error(res.message);
+ } else {
+ this.items[i].monitorPointOptions = res.data;
+ }
+ });
}
monitorPointChange(value, i) {
@@ -105,16 +158,32 @@
for (let i = 0; i < this.items.length; i++) {
let item = this.items[i];
let queryItem: any = {};
- if (item.monitorPoint && item.time) {
+ if ((!!item.time) && (item.monitorPointOptions.length > 0)) {
for (var key in item) {
if (item[key]) {
queryItem[key] = item[key];
}
}
- queryItem.monitorPointId = queryItem.monitorPoint.id;
- queryItem.monitorPointName = queryItem.monitorPoint.name;
- queryItem.monitorPointAddress = queryItem.monitorPoint.address;
- delete queryItem.monitorPoint;
+ for (let i = 0; i < queryItem._areas.length; i++) {
+ let region = queryItem._areas[i];
+ if (i == 0) {
+ queryItem.provinceCode = region.value;
+ }
+ if (i == 1) {
+ queryItem.cityCode = region.value;
+ }
+ if (i == 2) {
+ queryItem.areaCode = region.value;
+ }
+ }
+ delete queryItem._areas;
+ if (queryItem.monitorPoint) {
+ queryItem.monitorPointId = queryItem.monitorPoint.id;
+ queryItem.monitorPointName = queryItem.monitorPoint.name;
+ queryItem.monitorPointAddress = queryItem.monitorPoint.address;
+ delete queryItem.monitorPoint;
+ }
+ delete queryItem.monitorPointOptions;
if (queryItem.device) {
queryItem.mac = queryItem.device.mac;
queryItem.deviceName = queryItem.device.name;
@@ -136,9 +205,10 @@
}
query.items = JSON.stringify(queryItems);
query.type = this.timeType.value;
- this.router.navigate(['report'], {queryParams: query});
+ sessionStorage.setItem("queryParams", JSON.stringify(query));
} else {
this.msgSrv.error('���������������������������������������');
+ return false;
}
}
}
--
Gitblit v1.8.0