From a2bd66a59a51c84100474d1ce3eb79d7ed3b754e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 15:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/routes.module.ts | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index ca79061..1c17f82 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -1,20 +1,28 @@
+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 { ForecastingWarningComponent } from './forecasting-warning/forecasting-warning.component';
+import { ReportComponent } from './report/report.component';
+import { PollutionManagementComponent } from './pollution/management/management.component';
+// import { MonitorpointComponent } from './statistics/monitorpoint/monitorpoint.component';
+// import { CalendarComponent } from './statistics/calendar/calendar.component';
+// import { AnalysisComponent } from './statistics/analysis/analysis.component';
+import { EnvironmentManagementComponent } from './environment/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 +33,38 @@
import 'rxjs/add/operator/filter';
import 'rxjs/add/operator/last';
import 'rxjs/add/operator/delay';
+import { GridTraceComponent } from './grid-trace/grid-trace.component';
+import { RaiseDustComponent } from './raise-dust/raise-dust.component';
+import { SandTableComponent } from './sand-table/sand-table.component';
+import { RealTimeComponent } from './raise-dust/real-time/real-time.component';
+import { StatisticalQueryComponent } from './raise-dust/statistical-query/statistical-query.component';
+import { ImageGrabbingComponent } from './raise-dust/image-grabbing/image-grabbing.component';
+
@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,
+ ForecastingWarningComponent,
+ PollutionManagementComponent,
+ // MonitorpointComponent,
+ // CalendarComponent,
+ // AnalysisComponent,
+ EnvironmentManagementComponent,
+ GridTraceComponent,
+ RaiseDustComponent,
+ SandTableComponent,
+ RealTimeComponent,
+ StatisticalQueryComponent,
+ ImageGrabbingComponent
],
- exports: [
- RouterModule
+ providers: [
+ _HttpClient,
+ DateService
]
})
--
Gitblit v1.8.0