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 | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 21f6cda..2a66c5d 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -13,14 +13,25 @@
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 { EnvironmentManagementComponent } from 'app/routes/environment/management/management.component';
const routes: Routes = [
{
path: '',
component: LayoutDefaultComponent,
children: [
- { path: '', redirectTo: 'dashboard/workplace', pathMatch: 'full' },
+ { path: "", redirectTo: "home-page", pathMatch: "full" },
+ {
+ 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' } },
@@ -32,7 +43,9 @@
{ path: 'systems', loadChildren: './systems/systems.module#SystemsModule' },
{ path: 'reports', loadChildren: './reports/reports.module#ReportsModule' },
- { path: 'pollution/management', component: PollutionManagementComponent }
+ { path: 'forecasting-warning', component: ForecastingWarningComponent },
+ { path: 'pollution/management', component: PollutionManagementComponent },
+ { path: 'environment/management', component: EnvironmentManagementComponent }
]
}, // passport
{
--
Gitblit v1.8.0