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 | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 31d5571..fbc4207 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';
@@ -63,14 +62,12 @@
public sensorArr: any = [];
public items: any = [];
- private timeType: any = {};
public title: string;
private timeArr = ['���', '���', '���', '���', '���'];
-
+ public typeArr = ['year', 'month', 'day', 'hour'];
constructor(
public injector: Injector,
public http: HttpClient,
- public activeRoute: ActivatedRoute,
public msgSrv: NzMessageService
) {
for (let index = 0; index < 30; index++) {
@@ -79,9 +76,11 @@
}
ngOnInit() {
- this.activeRoute.queryParams.subscribe(params => {
+ 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);
@@ -89,12 +88,13 @@
const option = this.echartOption;
const sensors = res.data.sensors;
const timeArr = this.timeArr;
+ const label = timeArr[this.typeArr.indexOf(timeType)];
option.xAxis.data = res.data.times;
- option.xAxis.name = timeArr[timeArr.indexOf(timeType.label) + 1];
+ 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 = [];
@@ -105,7 +105,7 @@
}
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);
+ 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,
@@ -136,6 +136,10 @@
}
}
});
- });
+
+ } else {
+ this.msgSrv.error("������������������������������������");
+ setTimeout("window.close();",1000);
+ }
}
}
--
Gitblit v1.8.0