From 09d02da80ec5bd59836427007169fdd03738e393 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Jul 2018 11:36:41 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/home-page/home-page/home-page.component.ts | 8 ++++----
1 files changed, 4 insertions(+), 4 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 49e739f..2425846 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
@@ -61,7 +61,7 @@
});
}
-
+
public aqiChartOption = {};
public aqiEchartsIntance;
public aqiChartLoading = false;
@@ -71,11 +71,11 @@
public meteChartOption = {};
public meteEchartsIntance;
public meteChartLoading = false;
- private onMeteChartInit(e): void {
+ public onMeteChartInit(e): void {
this.meteEchartsIntance = e;
}
private reloadAqiChart(): void {
- // const timeList = this.grid.columns.map(item => item.text);
+ // const timeList = this.grid.columns.map(item => item.text);
if (!!this.aqiEchartsIntance) {
this.aqiChartOption = null;
this.aqiEchartsIntance.clear();
@@ -84,7 +84,7 @@
// 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.newArray(0, 24, null, '���')}]});
--
Gitblit v1.8.0