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/report/report.component.ts | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index f898999..8ef6a88 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -9,11 +9,14 @@
@Component({
selector: 'app-report',
templateUrl: './report.component.html',
- styles: []
+ // styles: ['./report.component.less'],
+ styleUrls: ['./report.component.css']
+
})
export class ReportComponent implements OnInit {
[x: string]: any;
+ spinning: boolean = true;
constructor(
public injector: Injector,
public http: HttpClient,
@@ -26,6 +29,7 @@
}
public echartOption = {
+ backgroundColor: '',
title: {
text: '',
// subtext: '12������',
@@ -39,7 +43,8 @@
orient: 'vertical',
right: 40,
top: 5,
- bottom: 20
+ bottom: 20,
+ type: 'scroll'
},
toolbox: {
show: false,
@@ -80,31 +85,37 @@
};
sensorArr: any = [];
-
+ items: any = [];
+ timeType: any = {};
ngOnInit() {
+
this.activeRoute.queryParams.subscribe(params => {
- const items = JSON.parse(params.items);
- const query = params;
- this.http.get(environment.SERVER_BASH_URL + 'report/compare', {params: query}).subscribe((res: any) => {
+ const items = this.items = JSON.parse(params.items);
+ const timeType = this.timeType = JSON.parse(params.timeType);
+ 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
+ const times = res.data.times;
+ const sensors = res.data.sensors;
option.xAxis.data = times;
- option.xAxis.name = query.xAxisName;
+ option.xAxis.name = timeType.xAxisName;
for (let index = 0; index < sensors.length; index++) {
- let sensorKey = sensors[index];
- let split = sensorKey.split('-');
- option.title.text = split[1] + query.label + '������������';
- option.yAxis.name = split[2] && split[2] != 'null' ? split[2] : '';
+ const sensorKey = sensors[index];
+ const split = sensorKey.split('-');
+ option.title.text = split[1] + timeType.label + '������������';
+ option.yAxis.name = split[2] && split[2] !== 'null' ? '������:' + split[2] : '';
option.series = [];
option.legend.data = [];
-
+ if (index % 2 == 0) {
+ option.backgroundColor = 'rgba(0,0,0,0)';
+ } else {
+ option.backgroundColor = 'rgba(23,133,23,0.06)';
+ }
for (let i = 0; i < items.length; i++) {
- const legendName = items[i].formatTime + query.label + (items[i].mac ? items[i].deviceName : items[i].monitorPointName);
+ 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({
@@ -123,7 +134,9 @@
$('#mydiv' + i).remove();
}
});
+ $('#content').attr({style: "display: inline;"});
}
+ this.spinning = false;
});
});
}
--
Gitblit v1.8.0