From d53fe2390628caa2ac99424c6961dc6a92aa47ca Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Jul 2018 13:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

---
 src/app/routes/routes.module.ts |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index 42d8ebe..1f08295 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';
@@ -44,9 +45,10 @@
         ReportComponent,
         ForecastingWarningComponent,
         PollutionManagementComponent,
-        MonitorpointComponent,
-        CalendarComponent,
-        AnalysisComponent
+        // MonitorpointComponent,
+        // CalendarComponent,
+        // AnalysisComponent,
+        EnvironmentManagementComponent
     ],
     providers: [
         _HttpClient,

--
Gitblit v1.8.0