From 43f2601b8a5706a029f333204f7f52f153d61dfe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.ts | 122 +++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 65 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index c74c6b9..f898999 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -4,6 +4,7 @@
import {HttpClient} from '@angular/common/http';
import {ActivatedRoute} from '@angular/router';
import * as echarts from 'echarts';
+import * as $ from 'jquery';
@Component({
selector: 'app-report',
@@ -11,22 +12,23 @@
styles: []
})
export class ReportComponent implements OnInit {
-
- public data: any;
-
- public isShow = true;
+ [x: string]: any;
constructor(
- injector: Injector,
+ public injector: Injector,
public http: HttpClient,
public activeRoute: ActivatedRoute,
public msgSrv: NzMessageService
- ) { }
+ ) {
+ for (let index = 0; index < 30; index++) {
+ this.sensorArr.push(index);
+ }
+ }
public echartOption = {
title: {
text: '',
- subtext: '12������',
+ // subtext: '12������',
left: 'center'
},
tooltip: {
@@ -34,10 +36,13 @@
},
legend: {
data: [],
- left: 'left'
+ orient: 'vertical',
+ right: 40,
+ top: 5,
+ bottom: 20
},
toolbox: {
- show: true,
+ show: false,
feature: {
dataZoom: {
yAxisIndex: 'none'
@@ -60,79 +65,66 @@
},
series: [
- {
- smooth: false,
- 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 = [];
+
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) => {
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.title.text = query.sensorName + query.label + '������������';
- option.series[0].data = [];
- option.legend.data[0] = '';
- option.series[0].name = '';
- option.series[1].data = [];
- option.legend.data[1] = '';
- option.series[1].name = '';
- if (data.dataA) {
- const legendNamea = (query.deviceaName ? query.deviceaName : query.monitorPointaName) + query.time + query.label;
- option.series[0].data = data.dataA;
- option.legend.data[0] = legendNamea;
- option.series[0].name = legendNamea;
+ 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;
- }
- option.yAxis.name = query.sensorUnit;
- option.xAxis.name = query.xAxisName;
- const myChart = echarts.init(document.getElementById('mydiv'));
+ const myChart = echarts.init(document.getElementById('mydiv' + index));
myChart.setOption(option, true);
window.onresize = myChart.resize;
}
- this.isShow = true;
+ this.sensorArr.forEach(i => {
+ if (i >= sensors.length) {
+ $('#mydiv' + i).remove();
+ }
+ });
}
-
});
});
-
- }
-
- doPrint() {
- this.isShow = false;
- window.print();
- }
- printBtnBoolean = true;
- printComplete() {
- this.printBtnBoolean = true;
- }
- beforePrint() {
- this.printBtnBoolean = false;
}
}
--
Gitblit v1.8.0