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 | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index 42d8ebe..1c17f82 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -15,9 +15,10 @@
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 { 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';
// Statics
import 'rxjs/add/observable/throw';
@@ -32,6 +33,12 @@
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, RouteRoutingModule ],
@@ -44,9 +51,16 @@
ReportComponent,
ForecastingWarningComponent,
PollutionManagementComponent,
- MonitorpointComponent,
- CalendarComponent,
- AnalysisComponent
+ // MonitorpointComponent,
+ // CalendarComponent,
+ // AnalysisComponent,
+ EnvironmentManagementComponent,
+ GridTraceComponent,
+ RaiseDustComponent,
+ SandTableComponent,
+ RealTimeComponent,
+ StatisticalQueryComponent,
+ ImageGrabbingComponent
],
providers: [
_HttpClient,
--
Gitblit v1.8.0