From 401a044107202a74dd87408dd43d38cc2ab80fe6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 12 Mar 2018 09:25:59 +0800
Subject: [PATCH] 报表管理 优化
---
src/app/routes/report/report.component.ts | 115 +++++++++++++++++++++++++++------------------------------
1 files changed, 54 insertions(+), 61 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index a021f06..25e5f9c 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -5,6 +5,7 @@
import {ActivatedRoute} from '@angular/router';
import * as echarts from 'echarts';
import * as $ from 'jquery';
+
@Component({
selector: 'app-report',
templateUrl: './report.component.html',
@@ -13,13 +14,14 @@
export class ReportComponent implements OnInit {
[x: string]: any;
+ spinning: boolean = true;
constructor(
public injector: Injector,
public http: HttpClient,
public activeRoute: ActivatedRoute,
public msgSrv: NzMessageService
) {
- for (let index = 0; index < 19; index++) {
+ for (let index = 0; index < 30; index++) {
this.sensorArr.push(index);
}
}
@@ -35,7 +37,10 @@
},
legend: {
data: [],
- left: 'left'
+ orient: 'vertical',
+ right: 40,
+ top: 5,
+ bottom: 20
},
toolbox: {
show: false,
@@ -61,81 +66,69 @@
},
series: [
- {
- smooth: true,
- type: 'line',
- data: [],
- name: ''
- },
- {
- smooth: true,
- type: 'line',
- data: [],
- name: '',
- itemStyle: {
- normal: {
- barBorderRadius: [10, 10, 10, 10]
- }
- }
- }
+ // {
+ // smooth: true,
+ // type: 'line',
+ // data: [],
+ // name: '',
+ // itemStyle: {
+ // normal: {
+ // barBorderRadius: [10, 10, 10, 10]
+ // }
+ // }
+ // }
]
};
sensorArr: any = [];
- arr = new Array();
-
+
ngOnInit() {
+
this.activeRoute.queryParams.subscribe(params => {
+ const items = JSON.parse(params.items);
const query = params;
- console.info(query.label);
- query.items = JSON.parse(query.items);
- this.http.post(environment.SERVER_BASH_URL + 'report/compare', query).subscribe((res: any) => {
+ this.http.get(environment.SERVER_BASH_URL + 'report/compare', {params: query}).subscribe((res: any) => {
if (res.code === 0) {
this.msgSrv.error(res.message);
} else {
const option = this.echartOption;
- const data = res.data;
- if (data['time']) {
- option.xAxis.data = data['time'];
- option.series[0].data = [];
- option.legend.data[0] = '';
- option.series[0].name = '';
- option.series[1].data = [];
- option.legend.data[1] = '';
- option.series[1].name = '';
- option.xAxis.name = query.xAxisName;
- if (data.dataA) {
- const legendNamea = (query.deviceaName ? query.deviceaName : query.monitorPointaName) + query.time + query.label;
- option.legend.data[0] = legendNamea;
- option.series[0].name = legendNamea;
- let index = 0;
- for (const key in data.dataA[0]) {
- this.arr.push(index);
- let split = key.split('-');
- option.title.text = split[1] + query.label + '������������';
- option.series[0].data = data.dataA[0][key];
- option.yAxis.name = split[2];
- 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) {
- $('#mydiv' + i).remove();
- }
+ const datas = res.data.datas;
+ const times = res.data.times
+ const sensors = res.data.sensors
+ option.xAxis.data = times;
+ option.xAxis.name = query.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] : '';
+ option.series = [];
+ option.legend.data = [];
+
+ for (let i = 0; i < items.length; i++) {
+ const legendName = items[i].formatTime + query.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: 'line',
+ name: legendName
});
}
- if (data.dataB) {
- const legendNameb = (query.devicebName ? query.devicebName : params.monitorPointbName) + query.timeb + query.label;
- option.series[1].data = data['dataB'];
- option.legend.data[1] = legendNameb;
- option.series[1].name = legendNameb;
- }
+ const myChart = echarts.init(document.getElementById('mydiv' + index));
+ myChart.setOption(option, true);
+ window.onresize = myChart.resize;
}
+ this.sensorArr.forEach(i => {
+ if (i >= sensors.length) {
+ $('#mydiv' + i).remove();
+ }
+ });
+ $('#content').attr({style:"display: inline;"});
}
+ this.spinning = false;
});
});
}
-
}
--
Gitblit v1.8.0