From 36c5eeab117846d64aa632ca30ef7ac15ef20a27 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 19 Mar 2018 16:44:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/routes-routing.module.ts | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 8c628cf..348be0f 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -19,13 +19,12 @@
path: '',
component: LayoutDefaultComponent,
children: [
- { path: '', redirectTo: 'dashboard/v1', pathMatch: 'full' },
+ { path: '', 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' } },
{ 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' },
@@ -38,13 +37,13 @@
path: 'passport',
component: LayoutPassportComponent,
children: [
- {data:{title:'������������'}, path: 'login', component: UserLoginComponent }
+ {data: {title: '������������'}, path: 'login', component: UserLoginComponent }
]
}, // passport
{
path: 'report',
component: ReportComponent,
- data:{title:'������������'}
+ data: {title: '������������'}
},
{ path: '**', redirectTo: 'passport/login' }
];
--
Gitblit v1.8.0