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/v1/v1.component.ts | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/app/routes/dashboard/v1/v1.component.ts b/src/app/routes/dashboard/v1/v1.component.ts
index 4906f4b..e8e6596 100644
--- a/src/app/routes/dashboard/v1/v1.component.ts
+++ b/src/app/routes/dashboard/v1/v1.component.ts
@@ -1,16 +1,16 @@
+import { LoginService } from '@business/services/http/login.service';
import { NzMessageService } from 'ng-zorro-antd';
-import { Component } from '@angular/core';
-import { getFakeChartData } from '../../../../../_mock/chart.service';
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
@Component({
selector: 'app-dashboard-v1',
templateUrl: './v1.component.html'
})
-export class DashboardV1Component {
+export class DashboardV1Component implements OnInit {
- constructor(public msg: NzMessageService) {
- console.log(this.offlineChartData);
- }
+ constructor(private http: _HttpClient, public msg: NzMessageService,
+ public loginService:LoginService) { }
todoData: any[] = [
{ completed: true, avatar: '1', name: '���������', content: `������������������������������������������` },
@@ -23,7 +23,19 @@
quickMenu = false;
- webSite = [ ...getFakeChartData.visitData.slice(0, 10) ];
- salesData = [...getFakeChartData.salesData];
- offlineChartData = Object.assign([], getFakeChartData.offlineChartData);
+ webSite: any[] = [ ];
+ salesData: any[] = [ ];
+ offlineChartData: any[] = [];
+
+ ngOnInit() {
+ // ������������������,������������������������
+ setTimeout(() => {
+ this.loginService.loadUserContext();
+ }, 1);
+ // this.http.get('/chart').subscribe((res: any) => {
+ // this.webSite = res.visitData.slice(0, 10);
+ // this.salesData = res.salesData;
+ // this.offlineChartData = res.offlineChartData;
+ // });
+ }
}
--
Gitblit v1.8.0