From 71371f81071a72eecd7d7a02ae3825943aae50d1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 18 Apr 2018 08:57:38 +0800
Subject: [PATCH] 报表展示 饼图功能
---
src/app/routes/report/report.component.html | 7 -
src/app/routes/report/report.component.ts | 186 ++++++++++++++++++++++------------------------
src/app/routes/reports/demo/demo.component.ts | 1
src/app/routes/reports/excel/excel.component.html | 4
src/app/routes/reports/excel/excel.component.ts | 1
src/app/routes/reports/demo/demo.component.html | 4
6 files changed, 95 insertions(+), 108 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 624bb1b..d485e30 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -24,11 +24,6 @@
<div class="clear_fix"></div>
</div>
</div>
-
-
-
-
-
<div class="content">
<div *ngFor="let item of items;let i = index">
<div class="{{i % 2 == 0 ? 'left' : 'right'}}">
@@ -52,7 +47,7 @@
<div *ngFor="let i of sensorArr">
<div id="mydiv{{i}}" style="height: 485.35px; width: 1000px"></div>
</div>
- <!-- <div id="pieChar" style="height: 485.35px; width: 1000px"></div> -->
+ <div id="pieChar" style="height: 485.35px; width: 1000px"></div>
</div>
<div class="bg" *ngIf="!spinning">
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index ac0270b..aeebed5 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -12,6 +12,16 @@
})
export class ReportComponent implements OnInit {
+ constructor(
+ public injector: Injector,
+ public http: HttpClient,
+ public msgSrv: NzMessageService
+ ) {
+ for (let index = 0; index < 30; index++) {
+ this.sensorArr.push(index);
+ }
+ }
+
[x: string]: any;
public spinning = true;
@@ -34,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,
@@ -65,15 +63,14 @@
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);
- }
- }
+ 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������'}
+ ];
private pieCharOption: any = {
title: {
@@ -87,75 +84,10 @@
legend: {
// x : 'center',
top: '10%',
- data: ['PM 2.5', 'PM 10', '���������������CO���', '���������������SO������', '���������O������', '���������������NO������']
+ data: []
},
- graphic: [{
- type: 'text',
- left: '24%',
- top: '49%',
- style: {
- text: '������������'
- }
- }, {
- type: 'text',
- left: '74%',
- top: '49%',
- style: {
- text: '{b}'
- }
- }
- ],
- series: [
- {
- 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������'}
- ]
- },
- {
- name: '������������',
- type: 'pie',
- radius: ['30%', '50%'],
- center: ['75%', '50%'],
- label: {
- normal: {
- 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������'}
-
- ]
- }
- ]
+ graphic: [],
+ series: []
};
ngOnInit() {
@@ -190,11 +122,12 @@
for (let i = 0; i < items.length; i++) {
this.title = items[i].formatTime;
items[i].deviceCount = deviceCounts[i];
- if (!items[i].monitorPointid) {
+ 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;
+ 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({
name: legendName,
data: res.data.datas[i][sensorKey],
@@ -222,14 +155,71 @@
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)';
+
+ 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 {
- this.pieCharOption.backgroundColor = 'rgba(23,133,23,0.06)';
+ $('#pieChar').remove();
}
-// const myChart = echarts.init(document.getElementById('pieChar'));
-// myChart.setOption(this.pieCharOption, true);
-// window.onresize = myChart.resize;
}
});
} else {
diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html
index 529fe8e..c584b66 100644
--- a/src/app/routes/reports/demo/demo.component.html
+++ b/src/app/routes/reports/demo/demo.component.html
@@ -11,10 +11,10 @@
<!-- <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKeys" name="sensorKeys" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
<nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey + '-' + option.name + '-' + option.unit"></nz-option>
</nz-select> -->
- <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'hover'">
+ <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'click'">
<nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorKeys" [nzReadonly]="true" [nzPlaceHolder]="'��������� ������'">
<ng-template #suffix>
- <i class="anticon anticon-down ant-cascader-picker-arrow "></i>
+ <i class="anticon anticon-down ant-cascader-picker-arrow" style="right: 1px;"></i>
</ng-template>
</nz-input>
<ng-template #nzTemplate>
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 42e6d90..506b60c 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -238,6 +238,7 @@
}
}
if (validate && this.timeType && query.reportType) {
+ delete query.sensors;
if (this._sensors) {
const sensors = [];
for (const key in this._sensors) {
diff --git a/src/app/routes/reports/excel/excel.component.html b/src/app/routes/reports/excel/excel.component.html
index 4c8d63d..357faf4 100644
--- a/src/app/routes/reports/excel/excel.component.html
+++ b/src/app/routes/reports/excel/excel.component.html
@@ -8,10 +8,10 @@
<label>������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'hover'">
+ <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'click'">
<nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorKeys" [nzReadonly]="true" [nzPlaceHolder]="'��������� ������'">
<ng-template #suffix>
- <i class="anticon anticon-down ant-cascader-picker-arrow "></i>
+ <i class="anticon anticon-down ant-cascader-picker-arrow" style="right: 1px;"></i>
</ng-template>
</nz-input>
<ng-template #nzTemplate>
diff --git a/src/app/routes/reports/excel/excel.component.ts b/src/app/routes/reports/excel/excel.component.ts
index 4f8149a..a78888a 100644
--- a/src/app/routes/reports/excel/excel.component.ts
+++ b/src/app/routes/reports/excel/excel.component.ts
@@ -175,6 +175,7 @@
query.timeb = this.dateSrv.date_format(query.timeb, this.timeType.format);
}
query.type = this.timeType.value;
+ delete query.sensors;
if (this._sensors) {
const sensors = [];
for (const key in this._sensors) {
--
Gitblit v1.8.0