From b8b94e846dcde8680deff869ea65caee23c3bc89 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 03 Apr 2018 10:56:14 +0800
Subject: [PATCH] 报表优化
---
src/app/routes/report/report.component.ts | 94 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 8ef6a88..fbc4207 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -2,33 +2,21 @@
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: ['./report.component.less'],
styleUrls: ['./report.component.css']
})
export class ReportComponent implements OnInit {
[x: string]: any;
- spinning: boolean = true;
- constructor(
- public injector: Injector,
- public http: HttpClient,
- public activeRoute: ActivatedRoute,
- public msgSrv: NzMessageService
- ) {
- for (let index = 0; index < 30; index++) {
- this.sensorArr.push(index);
- }
- }
+ public spinning: boolean = true;
- public echartOption = {
+ private echartOption = {
backgroundColor: '',
title: {
text: '',
@@ -69,43 +57,44 @@
name: ''
},
- series: [
- // {
- // smooth: true,
- // type: 'line',
- // data: [],
- // name: '',
- // itemStyle: {
- // normal: {
- // barBorderRadius: [10, 10, 10, 10]
- // }
- // }
- // }
- ]
+ series: []
};
- sensorArr: any = [];
- items: any = [];
- timeType: any = {};
- ngOnInit() {
+ 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);
+ }
+ }
- this.activeRoute.queryParams.subscribe(params => {
+ 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 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 = [];
@@ -115,14 +104,19 @@
option.backgroundColor = 'rgba(23,133,23,0.06)';
}
for (let i = 0; i < items.length; i++) {
- const legendName = items[i].formatTime + timeType.label + (items[i].mac ? items[i].deviceName : items[i].monitorPointName);
+ this.title = items[i].formatTime;
+ 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 seriesData = datas[i]['data' + i][0][sensorKey];
option.series.push({
- data: seriesData,
+ name: legendName,
+ data: res.data.datas[i]['data' + i][0][sensorKey],
+ type: params.reportType,
smooth: true,
- type: 'line',
- name: legendName
+ itemStyle: {
+ normal: {
+ barBorderRadius: [10, 10, 10, 10]
+ }
+ }
});
}
const myChart = echarts.init(document.getElementById('mydiv' + index));
@@ -134,10 +128,18 @@
$('#mydiv' + i).remove();
}
});
- $('#content').attr({style: "display: inline;"});
+ 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];
+ }
}
- this.spinning = false;
});
- });
+
+ } else {
+ this.msgSrv.error("������������������������������������");
+ setTimeout("window.close();",1000);
+ }
}
}
--
Gitblit v1.8.0