From 7c26164dc8a00a230e074d320f3b2614c9080340 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Mar 2018 08:52:41 +0800
Subject: [PATCH] 默认中文，登录页面title设置，菜单面包屑无效链接去除
---
src/app/routes/dashboard/workplace/workplace.component.ts | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index bb72437..30e2c8b 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) => {
- 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);
+ // 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