From 79851e40e4da7fdbb14d0b729d01f710cf6d7fb0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 07 Mar 2018 08:51:49 +0800
Subject: [PATCH] 报表 优化
---
src/app/routes/reports/demo/demo.component.ts | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 41abb54..5060607 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -81,7 +81,7 @@
if (value) {
this.monitorPointOptions.forEach(monitorPoint => {
if (monitorPoint.id === value) {
- this.monitorPoint = monitorPoint;
+ this.items[i].monitorPointName = monitorPoint.name;
}
});
this.http.get(environment.SERVER_BASH_URL + 'device/monitorPointId', {params: {monitorPointId: value}}).subscribe((res: any) => {
@@ -94,17 +94,19 @@
} else {
this.items[i].monitorPoint = null;
this.items[i].mac = '';
+ this.items[i].monitorPointName = '';
}
}
deviceChange(value, i) {
- this.device = null;
if (value) {
this.deviceOptions.forEach(device => {
if (device.mac === value) {
- this.device = device;
+ this.items[i].deviceName = device.name;
}
});
+ } else {
+ this.items[i].deviceName = '';
}
}
@@ -128,15 +130,17 @@
reportQuery() {
const query = this.query;
- if (query.type) {
- this.items.forEach(item => {
- if (item.monitorPoint && item.time) {
- item.formatTime = this.dateSrv.date_format(item.time, this.time.format);
- } else {
- this.msgSrv.error('���������������������������������������');
- return;
- }
- });
+ let validate = true;
+ for (let i = 0; i < this.items.length; i++) {
+ let item = this.items[i];
+ if (item.monitorPoint && item.time) {
+ item.formatTime = this.dateSrv.date_format(item.time, this.time.format);
+ } else {
+ validate = false;
+ break;
+ }
+ }
+ if (validate && query.type) {
query.format = this.timeType.format;
query.typeFormat = this.timeType.typeFormat;
query.xAxisName = this.timeType.xAxisName;
@@ -148,15 +152,6 @@
this.msgSrv.error('���������������������������������������');
}
- }
-
- sensorChange(value) {
- this.sensor = {};
- this.sensorOptions.forEach(sensor => {
- if (sensor.sensorKey === value) {
- this.sensor = sensor;
- }
- });
}
}
--
Gitblit v1.8.0