From f8523eab69d2695163f9edb44fe822dbd0027068 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 25 Jul 2018 13:55:33 +0800
Subject: [PATCH] 图表 优化
---
src/app/routes/environment/management/management.component.ts | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/app/routes/environment/management/management.component.ts b/src/app/routes/environment/management/management.component.ts
index ab2ee99..d2ced06 100644
--- a/src/app/routes/environment/management/management.component.ts
+++ b/src/app/routes/environment/management/management.component.ts
@@ -6,6 +6,7 @@
import * as moment from 'moment';
import { DeviceService } from '@business/services/http/device.service';
import * as echarts from 'echarts';
+import * as $ from 'jquery';
@Component({
selector: 'environment-management',
@@ -14,8 +15,6 @@
providers: [DeviceService]
})
export class EnvironmentManagementComponent implements OnInit, OnDestroy {
-
- offlineChartData: any[] = [];
constructor(
private deviceService: DeviceService,
@@ -37,8 +36,7 @@
data: ['������������', '������������']
},
xAxis: {
- type: 'category',
- data: []
+ type: 'category'
},
yAxis: {
type: 'value',
@@ -46,12 +44,10 @@
},
series: [
{
- data: [],
type: 'line',
smooth: true,
name: '������������'
}, {
- data: [],
type: 'line',
smooth: true,
name: '������������'
@@ -71,10 +67,16 @@
])
};
this.http2.get(environment.SERVER_BASH_URL + 'report/compare', {params: params}).subscribe((res: any) => {
- this.option.xAxis.data = res.data.times;
- this.option.series[0].data = res.data.datas[0]['e1'];
- this.option.series[1].data = res.data.datas[1]['e1'];
- PM25.setOption(this.option, false);
+ const PM25Option = $.extend(true,
+ {
+ xAxis: {data: res.data.times},
+ series: [
+ {data: res.data.datas[0]['e1']},
+ {data: res.data.datas[1]['e1']}
+ ]
+ },
+ this.option);
+ PM25.setOption(PM25Option, false);
window.onresize = PM25.resize;
PM25.hideLoading();
});
--
Gitblit v1.8.0