From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/dashboard/workplace/workplace.component.ts | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index 9b997a1..30e2c8b 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -79,22 +79,22 @@
constructor(private http: _HttpClient, public msg: NzMessageService) {}
ngOnInit() {
- 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.loading = false;
- });
+ // 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 = <any []>notice;
+ // this.activities = (<any []>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.loading = false;
+ // });
}
ngOnDestroy(): void {
--
Gitblit v1.8.0