From 79851e40e4da7fdbb14d0b729d01f710cf6d7fb0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 07 Mar 2018 08:51:49 +0800
Subject: [PATCH] 报表 优化
---
src/app/routes/report/report.component.ts | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 4ed6d86..f898999 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -20,7 +20,7 @@
public activeRoute: ActivatedRoute,
public msgSrv: NzMessageService
) {
- for (let index = 0; index < 19; index++) {
+ for (let index = 0; index < 30; index++) {
this.sensorArr.push(index);
}
}
@@ -36,7 +36,10 @@
},
legend: {
data: [],
- left: 'left'
+ orient: 'vertical',
+ right: 40,
+ top: 5,
+ bottom: 20
},
toolbox: {
show: false,
@@ -77,8 +80,7 @@
};
sensorArr: any = [];
- arr = new Array();
-
+
ngOnInit() {
this.activeRoute.queryParams.subscribe(params => {
const items = JSON.parse(params.items);
@@ -88,24 +90,23 @@
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;
+ 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 (const key in data[0].data0[0]) {
- this.arr.push(index);
- let split = key.split('-');
+ 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];
+ 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].mac ? items[i].mac : items[i].monitorPoint) + items[i].formatTime + query.label;
+ const legendName = items[i].formatTime + query.label + (items[i].mac ? items[i].deviceName : items[i].monitorPointName);
option.legend.data[i] = legendName;
- const seriesData = data[i]['data' + i][0][key];
+ const seriesData = datas[i]['data' + i][0][sensorKey];
option.series.push({
data: seriesData,
smooth: true,
@@ -116,11 +117,9 @@
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();
}
});
--
Gitblit v1.8.0