From 69e41a0824b0a4737360a5e19929555279e7c292 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Sun, 08 Apr 2018 11:25:47 +0800
Subject: [PATCH] 报表优化
---
src/app/routes/report/report.component.ts | 238 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 170 insertions(+), 68 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 76732eb..4fcfc16 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -2,31 +2,25 @@
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {Component, OnInit, Injector} from '@angular/core';
import {HttpClient} from '@angular/common/http';
-import {ActivatedRoute} from '@angular/router';
import * as echarts from 'echarts';
+import * as $ from 'jquery';
@Component({
selector: 'app-report',
templateUrl: './report.component.html',
- styles: []
+ styleUrls: ['./report.component.css']
+
})
export class ReportComponent implements OnInit {
+ [x: string]: any;
- public data: any;
+ public spinning: boolean = true;
- public isShow = true;
-
- constructor(
- injector: Injector,
- public http: HttpClient,
- public activeRoute: ActivatedRoute,
- public msgSrv: NzMessageService
- ) { }
-
- public echartOption = {
+ private echartOption = {
+ backgroundColor: '',
title: {
text: '',
- subtext: '12������',
+ // subtext: '12������',
left: 'center'
},
tooltip: {
@@ -34,7 +28,11 @@
},
legend: {
data: [],
- left: 'left'
+ orient: 'vertical',
+ right: 40,
+ top: 5,
+ bottom: 20,
+ type: 'scroll'
},
toolbox: {
show: false,
@@ -59,80 +57,184 @@
name: ''
},
+ series: []
+ };
+
+ 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 msgSrv: NzMessageService
+ ) {
+ for (let index = 0; index < 30; index++) {
+ this.sensorArr.push(index);
+ }
+ }
+
+ private pieCharOption: any = {
+ title: {
+ text: 'AQI������������������������',
+ x: 'center'
+ },
+ tooltip: {
+ trigger: 'item',
+ formatter: "{a} <br/>{b}: {c} ({d}%)"
+ },
+ legend: {
+ //x : 'center',
+ top: '10%',
+ data: ['PM 2.5', 'PM 10', '���������������CO���', '���������������SO������', '���������O������', '���������������NO������']
+ },
+ graphic: [{
+ type: 'text',
+ left: '24%',
+ top: '49%',
+ style: {
+ text: '������������'
+ }
+ }, {
+ type: 'text',
+ left: '74%',
+ top: '49%',
+ style: {
+ text: '{b}'
+ }
+ }
+ ],
series: [
{
- smooth: false,
- type: 'line',
- data: [],
- name: ''
+ name: '������������',
+ type: 'pie',
+ radius: ['30%', '50%'],
+ center: ['25%', '50%'],
+ label: {
+ normal: {
+ formatter: "{b}:{d}%"
+ }
+ },
+ labelLine: {
+ normal: {
+ show: true
+ }
+ },
+ data: [
+ {value: 100, name: 'PM 2.5'},
+ {value: 100, name: 'PM 10'},
+ {value: 200, name: '���������������CO���'},
+ {value: 200, name: '���������������SO������'},
+ {value: 100, name: '���������O������'},
+ {value: 100, name: '���������������NO������'}
+ ]
},
{
- smooth: true,
- type: 'line',
- data: [],
- name: '',
- itemStyle: {
+ name: '������������',
+ type: 'pie',
+ radius: ['30%', '50%'],
+ center: ['75%', '50%'],
+ label: {
normal: {
- barBorderRadius: [10, 10, 10, 10]
+ formatter: "{b}:{d}%",
}
- }
+ },
+ labelLine: {
+ normal: {
+ show: true,
+ }
+ },
+ data: [
+ {value: 0, name: 'PM 2.5'},
+ {value: 0, name: 'PM 10'},
+ {value: 100, name: '���������������CO���'},
+ {value: 100, name: '���������������SO������'},
+ {value: 100, name: '���������O������'},
+ {value: 100, name: '���������������NO������'}
+
+ ]
}
]
};
ngOnInit() {
- this.activeRoute.queryParams.subscribe(params => {
- const query = params;
- this.http.get(environment.SERVER_BASH_URL + 'report/compare', {params: query}).subscribe((res: any) => {
+ const params = JSON.parse(sessionStorage.getItem("queryParams"));
+ if (!!params) {
+ localStorage.removeItem("queryParams");
+ 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;
- 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 sensors = res.data.sensors;
+ const deviceCounts = res.data.deviceCounts;
+ 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)';
}
- 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;
+ for (let i = 0; i < items.length; i++) {
+ this.title = items[i].formatTime;
+ items[i].deviceCount = deviceCounts[i];
+ if (!items[i].monitorPointid) {
+ items[i].monitorPointName = items[i].areaName
+ }
+ const legendName = items[i].formatTime + label + (items[i].mac ? '������:' + items[i].deviceName : (items[i].monitorPointid ? '���������:' + items[i].monitorPointName : items[i].areaName));
+ option.legend.data[i] = legendName;
+ option.series.push({
+ name: legendName,
+ data: res.data.datas[i][sensorKey],
+ type: params.reportType,
+ smooth: true,
+ itemStyle: {
+ normal: {
+ barBorderRadius: [10, 10, 10, 10]
+ }
+ }
+ });
}
- 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();
+ }
+ });
+ 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];
+ }
+ if (sensors.length % 2 == 0) {
+ this.pieCharOption.backgroundColor = 'rgba(0,0,0,0)';
+ } else {
+ this.pieCharOption.backgroundColor = 'rgba(23,133,23,0.06)';
+ }
+// const myChart = echarts.init(document.getElementById('pieChar'));
+// myChart.setOption(this.pieCharOption, true);
+// window.onresize = myChart.resize;
}
-
});
- });
-
- }
-
- doPrint() {
- this.isShow = false;
- window.print();
- }
- printBtnBoolean = true;
- printComplete() {
- this.printBtnBoolean = true;
- }
- beforePrint() {
- this.printBtnBoolean = false;
+ } else {
+ this.msgSrv.error("������������������������������������");
+ setTimeout("window.close();", 1000);
+ }
}
}
--
Gitblit v1.8.0