From 3405a42d4434bb77026c029ed20f2898ba665107 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 11 Jan 2018 09:25:50 +0800
Subject: [PATCH] 框架升级
---
src/app/routes/dashboard/analysis/analysis.component.ts | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/dashboard/analysis/analysis.component.ts b/src/app/routes/dashboard/analysis/analysis.component.ts
index cf7b128..8a196fb 100644
--- a/src/app/routes/dashboard/analysis/analysis.component.ts
+++ b/src/app/routes/dashboard/analysis/analysis.component.ts
@@ -1,7 +1,8 @@
+import { HttpClient } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
import { getTimeDistance, yuan } from '@delon/abc';
-import { getFakeChartData } from '../../../../../_mock/chart.service';
+import { _HttpClient } from '@delon/theme';
@Component({
selector: 'app-dashboard-analysis',
@@ -9,6 +10,7 @@
styleUrls: ['./analysis.component.less']
})
export class DashboardAnalysisComponent implements OnInit {
+
data: any = {
salesData: [],
offlineData: []
@@ -25,17 +27,18 @@
};
});
- constructor(public msg: NzMessageService) {}
+ constructor(private http: _HttpClient, public msg: NzMessageService,
+ private http2: HttpClient) {}
ngOnInit() {
- setTimeout(() => {
- this.data = Object.assign({}, getFakeChartData);
- this.data.offlineData.forEach((item: any) => {
- item.chart = Object.assign([], getFakeChartData.offlineChartData);
+ 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();
- }, 500);
+ });
}
setDate(type: any) {
--
Gitblit v1.8.0