From 71371f81071a72eecd7d7a02ae3825943aae50d1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 18 Apr 2018 08:57:38 +0800
Subject: [PATCH] 报表展示  饼图功能

---
 src/app/routes/routes.module.ts |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index 53906ae..c09bb38 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -1,16 +1,18 @@
-import { DevicesModule } from './devices/devices.module';
+import { UserLoginComponent } from './passport/login/login.component';
+import { DateService } from '@business/services/util/date.service';
 import { _HttpClient } from '@delon/theme';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { SharedModule } from '@shared/shared.module';
-import { environment } from '../../environments/environment';
-import { routes } from './routes';
+import { RouteRoutingModule } from './routes-routing.module';
+import { environment } from '@env/environment';
+// dashboard pages
 import { DashboardV1Component } from './dashboard/v1/v1.component';
 import { DashboardAnalysisComponent } from './dashboard/analysis/analysis.component';
 import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component';
 import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.component';
-import { CoreModule } from '@core/core.module';
-// region: zorro modules
+import { ReportComponent } from './report/report.component';
 // Statics
 import 'rxjs/add/observable/throw';
 
@@ -22,22 +24,20 @@
 import 'rxjs/add/operator/switchMap';
 import 'rxjs/add/operator/toPromise';
 import 'rxjs/add/operator/filter';
+
 @NgModule({
-    imports: [
-        SharedModule,
-        RouterModule.forRoot(routes, { useHash: environment.useHash })
-    ],
+    imports: [ SharedModule, RouteRoutingModule ],
     declarations: [
         DashboardV1Component,
         DashboardAnalysisComponent,
         DashboardMonitorComponent,
-        DashboardWorkplaceComponent
-    ],
-    exports: [
-        RouterModule
+        DashboardWorkplaceComponent,
+        UserLoginComponent,
+        ReportComponent
     ],
     providers: [
-        _HttpClient
+        _HttpClient,
+        DateService
     ]
 })
 

--
Gitblit v1.8.0