From 63ad97852c7db6df7f44185881a8c9c031a230c9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 20 Apr 2018 09:06:51 +0800
Subject: [PATCH] 报警数据 饼图功能
---
src/app/routes/report/report.component.ts | 164 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 124 insertions(+), 40 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 32699da..aeebed5 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -2,7 +2,6 @@
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';
@@ -16,7 +15,6 @@
constructor(
public injector: Injector,
public http: HttpClient,
- public activeRoute: ActivatedRoute,
public msgSrv: NzMessageService
) {
for (let index = 0; index < 30; index++) {
@@ -26,9 +24,9 @@
[x: string]: any;
- public spinning: boolean = true;
+ public spinning = true;
- public echartOption = {
+ private echartOption = {
backgroundColor: '',
title: {
text: '',
@@ -46,18 +44,6 @@
bottom: 20,
type: 'scroll'
},
- toolbox: {
- show: false,
- feature: {
- dataZoom: {
- yAxisIndex: 'none'
- },
- dataView: {readOnly: false},
- magicType: {type: ['line', 'bar']},
- restore: {},
- saveAsImage: {}
- }
- },
xAxis: {
type: 'category',
// boundaryGap: false,
@@ -72,30 +58,59 @@
series: []
};
- sensorArr: any = [];
- items: any = [];
- timeType: any = {};
- title: string;
- timeArr = ['���', '���', '���', '���', '���'];
- ngOnInit() {
+ public sensorArr: any = [];
+ public items: any = [];
+ public title: string;
+ private timeArr = ['���', '���', '���', '���', '���'];
+ public typeArr = ['year', 'month', 'day', 'hour'];
+ public sensorKeys: any = [
+ {key: 'e1', name: 'PM 2.5'},
+ {key: 'e2', name: 'PM 10'},
+ {key: 'e10', name: '���������������CO���'},
+ {key: 'e11', name: '���������������SO������'},
+ {key: 'e15', name: '���������O������'},
+ {key: 'e16', name: '���������������NO������'}
+ ];
- this.activeRoute.queryParams.subscribe(params => {
+ private pieCharOption: any = {
+ title: {
+ text: 'AQI������������������������',
+ x: 'center'
+ },
+ tooltip: {
+ trigger: 'item',
+ formatter: '{a} <br/>{b}: {c} ({d}%)'
+ },
+ legend: {
+ // x : 'center',
+ top: '10%',
+ data: []
+ },
+ graphic: [],
+ series: []
+ };
+
+ ngOnInit() {
+ const params = JSON.parse(sessionStorage.getItem('queryParams'));
+ if (!!params) {
+ localStorage.removeItem('queryParams');
const items = this.items = JSON.parse(params.items);
- const timeType = this.timeType = JSON.parse(params.timeType);
+ 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 datas = res.data.datas;
- const times = res.data.times;
const sensors = res.data.sensors;
- option.xAxis.data = times;
- option.xAxis.name = timeType.xAxisName;
+ 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] + timeType.label + '������������';
+ option.title.text = split[1] + label + '������������';
option.yAxis.name = split[2] && split[2] !== 'null' ? '������:' + split[2] : '';
option.series = [];
option.legend.data = [];
@@ -106,14 +121,18 @@
}
for (let i = 0; i < items.length; i++) {
this.title = items[i].formatTime;
- const legendName = items[i].formatTime + timeType.label + (items[i].mac ? items[i].deviceName : items[i].monitorPointName);
- option.legend.data[i] = legendName;
- const seriesData = datas[i]['data' + i][0][sensorKey];
+ 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));
+ items[i].legendName = option.legend.data[i] = legendName;
option.series.push({
- data: seriesData,
- smooth: true,
- type: params.reportType,
name: legendName,
+ data: res.data.datas[i][sensorKey],
+ type: params.reportType,
+ smooth: true,
itemStyle: {
normal: {
barBorderRadius: [10, 10, 10, 10]
@@ -130,17 +149,82 @@
$('#mydiv' + i).remove();
}
});
- $('#content').attr({style: "display: inline;"});
this.spinning = false;
- const title = this.title.replace(' ', '-').split('-');
+ const title: any[] = this.title.replace(' ', '-').split('-');
this.title = '';
for (let i = 0; i < title.length; i++) {
- if (i < 3) {
- this.title = this.title + title[i] + this.timeArr[i];
+ this.title += title[i] + timeArr[i];
+ }
+
+ if ((params.type == 'month' || params.type == 'year') && res.data.sortList.length > 0) {
+ let center = ['50%', '50%'];
+ let left = '40%';
+ const length = items.length;
+ const alarmDatas = res.data.alarmDatas;
+ for (let i = 0; i < length; i++) {
+ this.pieCharOption.legend.data = [];
+ let data = [];
+ this.sensorKeys.forEach(sensorKey => {
+ this.pieCharOption.legend.data.push(sensorKey.name);
+ if (alarmDatas[i]) {
+ data.push({
+ name: sensorKey.name,
+ value: alarmDatas[i][sensorKey.key]
+ });
+ }
+ });
+ if (length == 2) {
+ if (i == 0) {
+ center = ['25%', '50%'];
+ left = '15%';
+ } else {
+ center = ['75%', '50%'];
+ left = '65%';
+ }
+ }
+ this.pieCharOption.series.push({
+ name: items[i].monitorPointName,
+ type: 'pie',
+ radius: ['20%', '40%'],
+ center: center,
+ label: {
+ normal: {
+ formatter: "{b}:{d}%"
+ }
+ },
+ labelLine: {
+ normal: {
+ show: true
+ }
+ },
+ data: data
+ });
+ this.pieCharOption.graphic.push({
+ type: 'text',
+ left: left,
+ top: '20%',
+ style: {
+ text: items[i].legendName
+ }
+ });
}
+
+ 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;
+ } else {
+ $('#pieChar').remove();
}
}
});
- });
+ } else {
+ this.msgSrv.error('������������������������������������');
+ setTimeout('window.close();', 1000);
+ }
}
}
--
Gitblit v1.8.0