fengxiang
2018-01-29 61873531cdd8a365645fc3cb1fb22f9031ea5f0e
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 = <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;
        });
        // 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 {