From fdde9a5cb356933bac26b64b67b53167ce2f41bd Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 17 May 2018 10:03:29 +0800
Subject: [PATCH] 行业 优化
---
src/app/routes/reports/excel/excel.component.ts | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/app/routes/reports/excel/excel.component.ts b/src/app/routes/reports/excel/excel.component.ts
index 4f8149a..8e4dba4 100644
--- a/src/app/routes/reports/excel/excel.component.ts
+++ b/src/app/routes/reports/excel/excel.component.ts
@@ -26,6 +26,7 @@
{value: 'day', label: '���', format: 'YYYY-MM-DD'},
{value: 'hour', label: '���', format: 'YYYY-MM-DD HH'}
];
+ public professionOptions = [];
private treeClickStream: Subject<any> = new Subject<any>();
private _sensors: {[key: string]: string} = {};
@@ -52,6 +53,13 @@
this.msgSrv.error(res.message);
} else {
this.sensorOptions.push({id: -1, name: '������', isExpanded: true, children: res.data});
+ }
+ });
+ this.http.get(environment.SERVER_BASH_URL + 'mobile/profession').subscribe((res: any) => {
+ if (res.errno !== 0) {
+ this.msgSrv.error(res.message);
+ } else {
+ this.professionOptions = res.data;
}
});
}
@@ -128,7 +136,6 @@
const option = event.option;
this.query.areaCode = null;
this.query.monitorPointId = null;
- this.query.mac = null;
switch (event.index) {
case 0:
name = 'provinceCode';
@@ -151,20 +158,19 @@
this.monitorPointOptions = res.data;
}
});
+ this.getDevices();
+
}
- monitorPointChange(value) {
+ getDevices() {
this.query.mac = null;
- this.deviceOptions = [];
- if (value) {
- this.http.get(environment.SERVER_BASH_URL + 'device/monitorPointId', {params: {monitorPointId: value}}).subscribe((res: any) => {
- if (res.code === 0) {
- this.msgSrv.error(res.message);
- } else {
- this.deviceOptions = res.data;
- }
- });
- }
+ return this.http.get(environment.SERVER_BASH_URL + 'device/professionId', {params: this.query}).subscribe((res: any) => {
+ if (res.code === 0) {
+ this.msgSrv.error(res.message);
+ } else {
+ this.deviceOptions = res.data;
+ }
+ });
}
reportQuery() {
@@ -175,6 +181,7 @@
query.timeb = this.dateSrv.date_format(query.timeb, this.timeType.format);
}
query.type = this.timeType.value;
+ delete query.sensors;
if (this._sensors) {
const sensors = [];
for (const key in this._sensors) {
@@ -193,7 +200,7 @@
}
window.location.href = url + '_token=' + this.tokenService.get().token;
} else {
- this.msgSrv.error('������������������������������������������������������������');
+ this.msgSrv.error('���������������������������������������������������������������');
}
}
}
--
Gitblit v1.8.0