From ab64396f29860ead5a153e6fa063e957fab1a84f Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 23 Mar 2018 15:09:49 +0800
Subject: [PATCH] 报表 优化
---
src/app/routes/report/report.component.ts | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 32699da..4f85b42 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -81,17 +81,16 @@
this.activeRoute.queryParams.subscribe(params => {
const items = this.items = JSON.parse(params.items);
- const timeType = this.timeType = JSON.parse(params.timeType);
+ const timeType = this.timeType = JSON.parse(params.timeTypes);
this.http.get(environment.SERVER_BASH_URL + 'report/compare', {params: params}).subscribe((res: any) => {
if (res.code === 0) {
this.msgSrv.error(res.message);
} else {
const option = this.echartOption;
- const datas = res.data.datas;
- const times = res.data.times;
const sensors = res.data.sensors;
- option.xAxis.data = times;
- option.xAxis.name = timeType.xAxisName;
+ const timeArr = this.timeArr;
+ option.xAxis.data = res.data.times;
+ option.xAxis.name = timeArr[timeArr.indexOf(timeType.label) + 1];
for (let index = 0; index < sensors.length; index++) {
const sensorKey = sensors[index];
const split = sensorKey.split('-');
@@ -108,12 +107,11 @@
this.title = items[i].formatTime;
const legendName = items[i].formatTime + timeType.label + (items[i].mac ? items[i].deviceName : items[i].monitorPointName);
option.legend.data[i] = legendName;
- const seriesData = datas[i]['data' + i][0][sensorKey];
option.series.push({
- data: seriesData,
- smooth: true,
- type: params.reportType,
name: legendName,
+ data: res.data.datas[i]['data' + i][0][sensorKey],
+ type: params.reportType,
+ smooth: true,
itemStyle: {
normal: {
barBorderRadius: [10, 10, 10, 10]
@@ -132,12 +130,10 @@
});
$('#content').attr({style: "display: inline;"});
this.spinning = false;
- const title = this.title.replace(' ', '-').split('-');
+ const title: any[] = this.title.replace(' ', '-').split('-');
this.title = '';
for (let i = 0; i < title.length; i++) {
- if (i < 3) {
- this.title = this.title + title[i] + this.timeArr[i];
- }
+ this.title += title[i] + timeArr[i];
}
}
});
--
Gitblit v1.8.0