From 92381eb59bd9b182e5bc8f2f82833806a3496a31 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 16 Mar 2018 13:42:17 +0800
Subject: [PATCH] 报表优化
---
src/app/routes/reports/demo/demo.component.ts | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 41abb54..1189314 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -24,7 +24,12 @@
monitorPoint: null,
mac: '',
time: null,
- formatTime: null
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: '',
+ monitorPointAddress: '',
+ deviceCount: ''
+
}];
public sensorOptions = [];
@@ -52,11 +57,15 @@
addItem() {
const id = (this.items.length > 0) ? this.items[this.items.length - 1].id + 1 : 0;
const index = this.items.push({
- id,
+ id: id,
monitorPoint: null,
mac: '',
time: null,
- formatTime: null
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: '',
+ monitorPointAddress: '',
+ deviceCount: ''
});
}
@@ -81,7 +90,8 @@
if (value) {
this.monitorPointOptions.forEach(monitorPoint => {
if (monitorPoint.id === value) {
- this.monitorPoint = monitorPoint;
+ this.items[i].monitorPointName = monitorPoint.name;
+ this.items[i].monitorPointAddress = monitorPoint.address;
}
});
this.http.get(environment.SERVER_BASH_URL + 'device/monitorPointId', {params: {monitorPointId: value}}).subscribe((res: any) => {
@@ -89,22 +99,25 @@
this.msgSrv.error(res.message);
} else {
this.deviceOptions = res.data;
+ this.items[i].deviceCount = res.data.length;
}
});
} 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 = '';
}
}
@@ -115,7 +128,8 @@
{value: 'hour', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i', timeLength: 60}
];
-
+ timeType = this.typeOptions[0];
+
typeChange(searchText) {
this.typeOptions.forEach(types => {
if (types.value === searchText) {
@@ -128,21 +142,20 @@
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;
- }
- });
- query.format = this.timeType.format;
- query.typeFormat = this.timeType.typeFormat;
- query.xAxisName = this.timeType.xAxisName;
- query.label = this.timeType.label;
- query.timeLength = this.timeType.timeLength;
+ 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.timeType = JSON.stringify(this.timeType);
query.items = JSON.stringify(this.items);
+ console.info(this.items);
this.router.navigate(['report'], {queryParams: query});
} else {
this.msgSrv.error('���������������������������������������');
@@ -150,13 +163,7 @@
}
- sensorChange(value) {
- this.sensor = {};
- this.sensorOptions.forEach(sensor => {
- if (sensor.sensorKey === value) {
- this.sensor = sensor;
- }
- });
+ _disabledDate(current: Date): boolean {
+ return current && current.getTime() > Date.now() ;
}
-
}
--
Gitblit v1.8.0