From 5ad15d5e999b91da4afcc358063f80f95eb66ed9 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 16:03:09 +0800
Subject: [PATCH] 工作台数据统计页面
---
src/app/routes/routes-routing.module.ts | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 44cc309..e8f7f04 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -19,13 +19,16 @@
path: '',
component: LayoutDefaultComponent,
children: [
- { path: '', redirectTo: 'dashboard/v1', pathMatch: 'full' },
+ { path: '', redirectTo: 'dashboard/workplace', pathMatch: 'full' },
+<<<<<<< HEAD
+ { path: 'dashboard', redirectTo: 'dashboard/workplace', pathMatch: 'full' },
+=======
{ 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' } },
+>>>>>>> 9634327c9094fb2d2b5bb2a3e630971cd65d3112
{ 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' },
@@ -43,7 +46,8 @@
}, // passport
{
path: 'report',
- component: ReportComponent
+ component: ReportComponent,
+ data: {title: '������������'}
},
{ path: '**', redirectTo: 'passport/login' }
];
--
Gitblit v1.8.0