From 7f93b01660cae23d38e9fa8083fe24a952b7ef4c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 13 Jul 2018 14:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/app/routes/routes-routing.module.ts | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index ae052a2..549b3bc 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -13,6 +13,12 @@
import { ReportComponent } from './report/report.component';
import { UserLoginComponent } from 'app/routes/passport/login/login.component';
+import { ForecastingWarningComponent } from './forecasting-warning/forecasting-warning.component';
+import { PollutionManagementComponent } from 'app/routes/pollution/management/management.component';
+import { MonitorpointComponent } from 'app/routes/statistics/monitorpoint/monitorpoint.component';
+import { CalendarComponent } from 'app/routes/statistics/calendar/calendar.component';
+import { AnalysisComponent } from 'app/routes/statistics/analysis/analysis.component';
+import { EnvironmentManagementComponent } from 'app/routes/environment/management/management.component';
const routes: Routes = [
{
@@ -33,7 +39,16 @@
{ path: 'devices', loadChildren: './devices/devices.module#DevicesModule' },
{ path: 'sensors', loadChildren: './sensors/sensors.module#SensorsModule' },
{ path: 'systems', loadChildren: './systems/systems.module#SystemsModule' },
- { path: 'reports', loadChildren: './reports/reports.module#ReportsModule' }
+ { path: 'reports', loadChildren: './reports/reports.module#ReportsModule' },
+
+ { path: 'forecasting-warning', component: ForecastingWarningComponent },
+ { path: 'pollution/management', component: PollutionManagementComponent },
+
+ { path: 'statistics/monitorpoint', component: MonitorpointComponent },
+ { path: 'statistics/calendar', component: CalendarComponent },
+ { path: 'statistics/analysis', component: AnalysisComponent },
+
+ { path: 'environment/management', component: EnvironmentManagementComponent }
]
}, // passport
{
--
Gitblit v1.8.0