From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/routes-routing.module.ts | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 4cb980b..e8f7f04 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -19,30 +19,35 @@
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' },
{ path: 'systems', loadChildren: './systems/systems.module#SystemsModule' },
{ path: 'reports', loadChildren: './reports/reports.module#ReportsModule' },
+ { path: 'analysis', loadChildren: './analysis/analysis.module#AnalysisModule' },
]
}, // passport
{
path: 'passport',
component: LayoutPassportComponent,
children: [
- {data:{title:'������������'}, path: 'login', component: UserLoginComponent }
+ {data: {title: '������������'}, path: 'login', component: UserLoginComponent }
]
}, // passport
{
path: 'report',
- component: ReportComponent
+ component: ReportComponent,
+ data: {title: '������������'}
},
{ path: '**', redirectTo: 'passport/login' }
];
--
Gitblit v1.8.0