From e5641578fc31e1326433b99210e85328f9d8faf7 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Thu, 12 Jul 2018 15:01:48 +0800 Subject: [PATCH] updates --- src/app/routes/routes.module.ts | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts index ca79061..03a10f8 100644 --- a/src/app/routes/routes.module.ts +++ b/src/app/routes/routes.module.ts @@ -1,20 +1,23 @@ +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 { PagesModule } from './pages/pages.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 { CallbackComponent } from './callback/callback.component'; +import { ReportComponent } from './report/report.component'; +import { PollutionManagementComponent } from './pollution/management/management.component'; -// pro -import { ProUserLoginComponent } from './pro/user/login/login.component'; -import { ProUserRegisterComponent } from './pro/user/register/register.component'; -import { ProUserRegisterResultComponent } from './pro/user/register-result/register-result.component'; +// Statics +import 'rxjs/add/observable/throw'; + // Operators import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/debounceTime'; @@ -25,25 +28,21 @@ import 'rxjs/add/operator/filter'; import 'rxjs/add/operator/last'; import 'rxjs/add/operator/delay'; + @NgModule({ - imports: [ - SharedModule, - RouterModule.forRoot(routes, { useHash: environment.useHash }), - PagesModule - ], + imports: [ SharedModule, RouteRoutingModule ], declarations: [ DashboardV1Component, DashboardAnalysisComponent, DashboardMonitorComponent, DashboardWorkplaceComponent, - CallbackComponent, - // pro - ProUserLoginComponent, - ProUserRegisterComponent, - ProUserRegisterResultComponent + UserLoginComponent, + ReportComponent, + PollutionManagementComponent ], - exports: [ - RouterModule + providers: [ + _HttpClient, + DateService ] }) -- Gitblit v1.8.0