From a2bd66a59a51c84100474d1ce3eb79d7ed3b754e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 15:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/routes-routing.module.ts | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 7cec853..a6d1668 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -15,6 +15,13 @@
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';
+import { GridTraceComponent } from './grid-trace/grid-trace.component';
+import { ImageGrabbingComponent } from './raise-dust/image-grabbing/image-grabbing.component';
+import { SandTableComponent } from './sand-table/sand-table.component';
+import { RaiseDustComponent } from './raise-dust/raise-dust.component';
+import { RealTimeComponent } from './raise-dust/real-time/real-time.component';
+import { StatisticalQueryComponent } from './raise-dust/statistical-query/statistical-query.component';
const routes: Routes = [
{
@@ -26,19 +33,25 @@
path: "home-page",
loadChildren: "./home-page/home-page.module#HomePageModule"
},
- { 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' } },
- { path: 'dashboard/monitor', component: DashboardMonitorComponent, data: { translate: 'dashboard_monitor' } },
- { path: 'dashboard/workplace', component: DashboardWorkplaceComponent, data: { translate: 'dashboard_workplace' } },
- { path: 'users', loadChildren: './users/users.module#UsersModule' },
- { 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: "enterprise-management",
+ loadChildren: "./enterprise-management/enterprise-management.module#EnterpriseManagementModule"
+ },
+ { path: 'statistics', loadChildren: './statistics/statistics.module#StatisticsModule' },
{ path: 'forecasting-warning', component: ForecastingWarningComponent },
- { path: 'pollution/management', component: PollutionManagementComponent }
+ { path: 'pollution/management', component: PollutionManagementComponent },
+ { path: 'environment/management', component: EnvironmentManagementComponent },
+ { path: 'grid-trace', component: GridTraceComponent },
+ { path: 'reports', loadChildren: './reports/reports.module#ReportsModule' },
+ {
+ path: "operation",
+ loadChildren: "./operation/operation.module#OperationModule"
+ },
+ { path: 'sand-table', component: SandTableComponent },
+ { path: 'raise-dust', component: RaiseDustComponent },
+ { path: 'raise-dust/real-time', component: RealTimeComponent },
+ { path: 'raise-dust/statistical-query', component: StatisticalQueryComponent },
+ { path: 'raise-dust/image-grabbing', component: ImageGrabbingComponent },
]
}, // passport
{
--
Gitblit v1.8.0