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/workplace/workplace.component.ts | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index bb72437..9b997a1 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -1,8 +1,8 @@
+import { zip } from 'rxjs/observable/zip';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
import { getTimeDistance, yuan, fixedZero } from '@delon/abc';
-import { getNotice, getActivities } from '../../../../../_mock/api.service';
-import { getFakeChartData } from '../../../../../_mock/chart.service';
+import { _HttpClient } from '@delon/theme';
@Component({
selector: 'app-dashboard-workplace',
@@ -76,21 +76,25 @@
];
// endregion
- constructor(public msg: NzMessageService) {}
+ constructor(private http: _HttpClient, public msg: NzMessageService) {}
ngOnInit() {
- setTimeout(() => {
- this.notice = getNotice();
- this.activities = getActivities().map((item: any) => {
+ zip(
+ this.http.get('/chart'),
+ this.http.get('/api/notice'),
+ this.http.get('/api/activities')
+ ).subscribe(([ chart, notice, activities ]) => {
+ this.radarData = chart.radarData;
+ this.notice = notice;
+ this.activities = activities.map((item: any) => {
item.template = item.template.split(/@\{([^{}]*)\}/gi).map((key: string) => {
if (item[key]) return `<a>${item[key].name}</a>`;
return key;
});
return item;
});
- this.radarData = getFakeChartData.radarData;
this.loading = false;
- }, 500);
+ });
}
ngOnDestroy(): void {
--
Gitblit v1.8.0