From aefa2dc89b44f21453e9e3bf19c90d41b1c83e8e Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 13 Jul 2018 15:22:13 +0800
Subject: [PATCH] updates
---
src/app/routes/home-page/home-page/home-page.component.ts | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/home-page/home-page/home-page.component.ts b/src/app/routes/home-page/home-page/home-page.component.ts
index 0bb0017..e6338ef 100644
--- a/src/app/routes/home-page/home-page/home-page.component.ts
+++ b/src/app/routes/home-page/home-page/home-page.component.ts
@@ -13,6 +13,8 @@
constructor(
private http:_HttpClient,
) {
+ this.reloadAqiChart();
+ this.reloadMeteChart()
}
salesData: any[] = [ ];
ngOnInit() {
@@ -34,16 +36,41 @@
// this.webSite = res.visitData.slice(0, 10);
this.salesData = res.salesData;
// this.offlineChartData = res.offlineChartData;
- });
+ });
+ this.http.get('/aqi/forecast24hours',{base: 25,range: 10}).subscribe(
+ (res: any) => {
+ this.aqiEchartsIntance.setOption(
+ {
+ series: [{type: 'line', data: res}]
+ }
+ )
+ }
+ );
+ this.http.get('/aqi/forecast24hours',{base: 30,range: 8}).subscribe(
+ (res: any) => {
+ this.meteEchartsIntance.setOption(
+ {
+ series: [{type: 'line', data: res}]
+ }
+ )
+ }
+ );
}
- public aqiChartOption
+
+ public aqiChartOption = {};
public aqiEchartsIntance;
public aqiChartLoading = false;
public onApiChartInit(e): void {
this.aqiEchartsIntance = e;
}
- private reloadChart(): void {
- // const timeList = this.grid.columns.map(item => item.text);
+ public meteChartOption = {};
+ public meteEchartsIntance;
+ public meteChartLoading = false;
+ public onMeteChartInit(e): void {
+ this.meteEchartsIntance = e;
+ }
+ private reloadAqiChart(): void {
+ // const timeList = this.grid.columns.map(item => item.text);
if (!!this.aqiEchartsIntance) {
this.aqiChartOption = null;
this.aqiEchartsIntance.clear();
@@ -52,11 +79,29 @@
// if ( this.chartSelectedIndex < this.grid.data.length ) {
// series = [{type: 'line', data: this.grid.data[this.chartSelectedIndex]}];
// }
-
+
// this.initOpton(chartOption ,{ xAxis : [{data : []}]});
// this.aqiChartOption = true;
- this.initOpton(this.aqiChartOption ,{ xAxis : [{data : []}]});
+ this.initOpton(this.aqiChartOption ,{ xAxis : [{data : this.newArray(0, 24, null, '���')}]});
}
+ private reloadMeteChart(): void {
+ if (!!this.aqiEchartsIntance) {
+ this.aqiChartOption = null;
+ this.aqiEchartsIntance.clear();
+ }
+ this.initOpton(this.meteChartOption ,{ xAxis : [{data : this.newArray(0, 24, null, '���')}]});
+ }
+ private newArray = (startOrLen: number, len?: number, prefix?: string, suffix?: string) => {
+ const result = [];
+ const s = !!len ? startOrLen : 0;
+ len = !!len ? len : startOrLen;
+ suffix = !!suffix ? suffix : '';
+ prefix = !!prefix ? prefix : '';
+ for (let i = s; result.length < len; i++) {
+ result.push(prefix + i + suffix);
+ }
+ return result;
+}
private initOpton(chartOption,opt: {[key: string]: object}) {
const defaultOption = {
title: {
@@ -99,7 +144,7 @@
series : [
]
};
- $.extend(true, defaultOption, opt);
- chartOption = defaultOption;
+ Object.assign( defaultOption, opt);
+ Object.assign(chartOption, defaultOption);
}
}
--
Gitblit v1.8.0