From 051a77599ca8b7972df8728ff46822d308627cbc Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 28 Mar 2018 14:32:32 +0800
Subject: [PATCH] 报表 优化
---
src/app/routes/report/report.component.ts | 63 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 32699da..64d1127 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -13,22 +13,11 @@
})
export class ReportComponent implements OnInit {
- constructor(
- public injector: Injector,
- public http: HttpClient,
- public activeRoute: ActivatedRoute,
- public msgSrv: NzMessageService
- ) {
- for (let index = 0; index < 30; index++) {
- this.sensorArr.push(index);
- }
- }
-
[x: string]: any;
public spinning: boolean = true;
- public echartOption = {
+ private echartOption = {
backgroundColor: '',
title: {
text: '',
@@ -72,30 +61,40 @@
series: []
};
- sensorArr: any = [];
- items: any = [];
- timeType: any = {};
- title: string;
- timeArr = ['���', '���', '���', '���', '���'];
- ngOnInit() {
+ public sensorArr: any = [];
+ public items: any = [];
+ public title: string;
+ private timeArr = ['���', '���', '���', '���', '���'];
+ public typeArr = ['year', 'month', 'day', 'hour'];
+ constructor(
+ public injector: Injector,
+ public http: HttpClient,
+ public activeRoute: ActivatedRoute,
+ public msgSrv: NzMessageService
+ ) {
+ for (let index = 0; index < 30; index++) {
+ this.sensorArr.push(index);
+ }
+ }
+ ngOnInit() {
this.activeRoute.queryParams.subscribe(params => {
const items = this.items = JSON.parse(params.items);
- const timeType = this.timeType = JSON.parse(params.timeType);
+ const timeType = params.type;
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;
+ const label = timeArr[this.typeArr.indexOf(timeType)];
+ option.xAxis.data = res.data.times;
+ option.xAxis.name = timeArr[timeArr.indexOf(label) + 1];
for (let index = 0; index < sensors.length; index++) {
const sensorKey = sensors[index];
const split = sensorKey.split('-');
- option.title.text = split[1] + timeType.label + '������������';
+ option.title.text = split[1] + label + '������������';
option.yAxis.name = split[2] && split[2] !== 'null' ? '������:' + split[2] : '';
option.series = [];
option.legend.data = [];
@@ -106,14 +105,13 @@
}
for (let i = 0; i < items.length; i++) {
this.title = items[i].formatTime;
- const legendName = items[i].formatTime + timeType.label + (items[i].mac ? items[i].deviceName : items[i].monitorPointName);
+ const legendName = items[i].formatTime + 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]
@@ -130,14 +128,11 @@
$('#mydiv' + i).remove();
}
});
- $('#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