From af9fa5a094ca652293a890f06634b59c955e1067 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 30 Jul 2018 09:06:15 +0800
Subject: [PATCH] token刷新
---
src/app/routes/statistics/analysis/analysis.component.ts | 94 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 26 deletions(-)
diff --git a/src/app/routes/statistics/analysis/analysis.component.ts b/src/app/routes/statistics/analysis/analysis.component.ts
index 1640b6e..e129154 100644
--- a/src/app/routes/statistics/analysis/analysis.component.ts
+++ b/src/app/routes/statistics/analysis/analysis.component.ts
@@ -1,9 +1,11 @@
+import { environment } from '../../../../environments/environment';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
import { _HttpClient } from '@delon/theme';
import { HttpClient } from '@angular/common/http';
import * as moment from 'moment';
import { DeviceService } from '@business/services/http/device.service';
+import * as echarts from 'echarts';
@Component({
selector: 'statistics-analysis',
@@ -13,7 +15,8 @@
})
export class AnalysisComponent implements OnInit, OnDestroy {
- data: any = {};
+ offlineChartData1: any[] = [];
+ offlineChartData2: any[] = [];
constructor(
private deviceService: DeviceService,
@@ -21,36 +24,75 @@
public msg: NzMessageService,
private http2: HttpClient) {
}
+
+ public option = {
+ title: {
+ text: '',
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'item',
+ axisPointer: {
+ type: 'cross'
+ }
+ },
+ legend: {
+ right: '10%',
+ top: '10%',
+ data: ['������������', '������������']
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ name: '���������ug/m��'
+ },
+ series: [
+ {
+ data: [],
+ type: 'line',
+ smooth: true,
+ name: '������������'
+ }, {
+ data: [],
+ type: 'line',
+ smooth: true,
+ name: '������������'
+ }
+ ]
+ };
ngOnInit() {
- const searchData = [];
- for (let i = 0; i < 50; i += 1) {
- searchData.push({
- index: i + 1,
- point: `������������-${i}`,
- value: Math.floor(Math.random() * 100)
- });
- }
+ const offlineChartData = [[], [], [], []];
+ const params = {size: '24'};
+ this.http2.get(environment.SERVER_BASH_URL + 'demo/compare', {params: params}).subscribe((res: any) => {
+ res.forEach(data => {
+ offlineChartData[0].push(data.this_month_PM2_5);
+ offlineChartData[1].push(data.last_month_PM2_5);
+ offlineChartData[2].push(data.this_month_PM10);
+ offlineChartData[3].push(data.last_month_PM2_5);
+ this.option.xAxis.data.push(data.format_time);
+ });
- this.data = {
- searchData: searchData
- };
+ const PM25 = echarts.init(document.getElementById('PM25'));
+ this.option.series[0].data = offlineChartData[0];
+ this.option.series[1].data = offlineChartData[1];
+ PM25.setOption(this.option, false);
+
+ const PM10 = echarts.init(document.getElementById('PM10'));
+ this.option.series[0].data = offlineChartData[2];
+ this.option.series[1].data = offlineChartData[3];
+ PM10.setOption(this.option, false);
+
+ window.addEventListener('resize', function() {
+ PM25.resize();
+ PM10.resize();
+ });
+ });
}
ngOnDestroy(): void {
- }
-
- sort(sortName, sortValue) {
- this.data.searchData = [
- ...(<any[]>this.data.searchData).sort((a, b) => {
- if (a[sortName] > b[sortName]) {
- return (sortValue === 'ascend') ? 1 : -1;
- } else if (a[sortName] < b[sortName]) {
- return (sortValue === 'ascend') ? -1 : 1;
- } else {
- return 0;
- }
- })
- ];
}
}
--
Gitblit v1.8.0