From feda1a3904098d7b11ce0dea324e7b8db6228828 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Jul 2018 13:18:56 +0800
Subject: [PATCH] 新增 企业管理 3页面
---
src/app/routes/home-page/home-page/home-page.component.ts | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..0535670 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, '���')}]});
@@ -176,7 +176,9 @@
salesTotal = 0;
changeSaleType() {
this.salesPieData = this.salesType === 'all' ? this.data.salesTypeData : (
- this.salesType === 'online' ? this.data.salesTypeDataOnline : this.data.salesTypeDataOffline
+ this.salesType === 'online' ? this.data.salesTypeDataOnline : (
+ this.salesType === 'online2' ? this.data.salesTypeDataOnline2 : this.data.salesTypeDataOffline
+ )
);
if (this.salesPieData) this.salesTotal = this.salesPieData.reduce((pre, now) => now.y + pre, 0);
}
--
Gitblit v1.8.0