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 | 112 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 4ed6d86..64d1127 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -9,23 +9,16 @@
@Component({
selector: 'app-report',
templateUrl: './report.component.html',
- styles: []
+ styleUrls: ['./report.component.css']
+
})
export class ReportComponent implements OnInit {
[x: string]: any;
- constructor(
- public injector: Injector,
- public http: HttpClient,
- public activeRoute: ActivatedRoute,
- public msgSrv: NzMessageService
- ) {
- for (let index = 0; index < 19; index++) {
- this.sensorArr.push(index);
- }
- }
+ public spinning: boolean = true;
- public echartOption = {
+ private echartOption = {
+ backgroundColor: '',
title: {
text: '',
// subtext: '12������',
@@ -36,7 +29,11 @@
},
legend: {
data: [],
- left: 'left'
+ orient: 'vertical',
+ right: 40,
+ top: 5,
+ bottom: 20,
+ type: 'scroll'
},
toolbox: {
show: false,
@@ -61,69 +58,82 @@
name: ''
},
- series: [
- // {
- // smooth: true,
- // type: 'line',
- // data: [],
- // name: '',
- // itemStyle: {
- // normal: {
- // barBorderRadius: [10, 10, 10, 10]
- // }
- // }
- // }
- ]
+ series: []
};
- sensorArr: any = [];
- arr = new Array();
+ 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 = 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 = 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 data = res.data.data;
- const time = res.data.time
- let index = 0;
- option.xAxis.data = time;
- option.xAxis.name = query.xAxisName;
-
- for (const key in data[0].data0[0]) {
- this.arr.push(index);
- let split = key.split('-');
- option.title.text = split[1] + query.label + '������������';
- option.yAxis.name = split[2];
+ const sensors = res.data.sensors;
+ 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] + 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].mac ? items[i].mac : items[i].monitorPoint) + items[i].formatTime + query.label;
+ this.title = items[i].formatTime;
+ const legendName = items[i].formatTime + label + (items[i].mac ? items[i].deviceName : items[i].monitorPointName);
option.legend.data[i] = legendName;
- const seriesData = data[i]['data' + i][0][key];
option.series.push({
- data: seriesData,
+ name: legendName,
+ data: res.data.datas[i]['data' + i][0][sensorKey],
+ type: params.reportType,
smooth: true,
- type: 'line',
- name: legendName
+ itemStyle: {
+ normal: {
+ barBorderRadius: [10, 10, 10, 10]
+ }
+ }
});
}
const myChart = echarts.init(document.getElementById('mydiv' + index));
myChart.setOption(option, true);
window.onresize = myChart.resize;
- index++;
}
-
this.sensorArr.forEach(i => {
- if (this.arr.indexOf(i) == -1) {
+ if (i >= sensors.length) {
$('#mydiv' + i).remove();
}
});
+ this.spinning = false;
+ const title: any[] = this.title.replace(' ', '-').split('-');
+ this.title = '';
+ for (let i = 0; i < title.length; i++) {
+ this.title += title[i] + timeArr[i];
+ }
}
});
});
--
Gitblit v1.8.0