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/routes.module.ts | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index a621ee2..c89de5e 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -1,10 +1,42 @@
+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 { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
+
+import { SharedModule } from '@shared/shared.module';
+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';
+// Statics
+import 'rxjs/add/observable/throw';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/debounceTime';
+import 'rxjs/add/operator/distinctUntilChanged';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/switchMap';
+import 'rxjs/add/operator/toPromise';
+import 'rxjs/add/operator/filter';
@NgModule({
- imports: [
- CommonModule
- ],
- declarations: []
+ imports: [ SharedModule, RouteRoutingModule ],
+ declarations: [
+ DashboardV1Component,
+ DashboardAnalysisComponent,
+ DashboardMonitorComponent,
+ DashboardWorkplaceComponent,
+ UserLoginComponent
+ ],
+ providers: [
+ _HttpClient,
+ DateService
+ ]
})
-export class RoutesModule { }
+
+export class RoutesModule {}
--
Gitblit v1.8.0