From 3d49dbbd9a5e15d14fc0a4388b17c19c0ac2e5f7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 13 Jul 2018 11:06:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/routes.module.ts | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index 03a10f8..42d8ebe 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -12,8 +12,12 @@
import { DashboardAnalysisComponent } from './dashboard/analysis/analysis.component';
import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component';
import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.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';
// Statics
import 'rxjs/add/observable/throw';
@@ -38,7 +42,11 @@
DashboardWorkplaceComponent,
UserLoginComponent,
ReportComponent,
- PollutionManagementComponent
+ ForecastingWarningComponent,
+ PollutionManagementComponent,
+ MonitorpointComponent,
+ CalendarComponent,
+ AnalysisComponent
],
providers: [
_HttpClient,
--
Gitblit v1.8.0