From 43f2601b8a5706a029f333204f7f52f153d61dfe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/routes.module.ts | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index ea7da38..c09bb38 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -1,33 +1,43 @@
-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 { 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';
-import { CoreModule } from '@core/core.module';
+import { ReportComponent } from './report/report.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: [
- 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