From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/dashboard/analysis/analysis.component.ts | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/dashboard/analysis/analysis.component.ts b/src/app/routes/dashboard/analysis/analysis.component.ts
index 8a196fb..0bc230f 100644
--- a/src/app/routes/dashboard/analysis/analysis.component.ts
+++ b/src/app/routes/dashboard/analysis/analysis.component.ts
@@ -31,14 +31,14 @@
private http2: HttpClient) {}
ngOnInit() {
- this.http.get('/chart').subscribe((res: any) => {
- res.offlineData.forEach((item: any) => {
- item.chart = Object.assign([], res.offlineChartData);
- });
- this.data = res;
- this.loading = false;
- this.changeSaleType();
- });
+ // this.http.get('/chart').subscribe((res: any) => {
+ // res.offlineData.forEach((item: any) => {
+ // item.chart = Object.assign([], res.offlineChartData);
+ // });
+ // this.data = res;
+ // this.loading = false;
+ // this.changeSaleType();
+ // });
}
setDate(type: any) {
--
Gitblit v1.8.0