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-routing.module.ts | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 6846a3e..2a66c5d 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -15,9 +15,7 @@
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 = [
{
@@ -29,6 +27,11 @@
path: "home-page",
loadChildren: "./home-page/home-page.module#HomePageModule"
},
+ {
+ path: "enterprise-management",
+ loadChildren: "./enterprise-management/enterprise-management.module#EnterpriseManagementModule"
+ },
+ { path: 'statistics', loadChildren: './statistics/statistics.module#StatisticsModule' },
{ path: 'dashboard', redirectTo: 'dashboard/v1', pathMatch: 'full' },
{ path: 'dashboard/v1', component: DashboardV1Component, data: { translate: 'dashboard_v1' } },
{ path: 'dashboard/analysis', component: DashboardAnalysisComponent, data: { translate: 'dashboard_analysis' } },
@@ -42,10 +45,7 @@
{ 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