From e3f745b1839f3c3c8be58efb7b81681f4f2d2e4c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 10:30:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/routes-routing.module.ts | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 891e3f5..9138cfb 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -10,6 +10,7 @@
import { DashboardAnalysisComponent } from './dashboard/analysis/analysis.component';
import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component';
import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.component';
+import { UserLoginComponent } from 'app/routes/passport/login/login.component';
const routes: Routes = [
@@ -29,8 +30,15 @@
{ path: 'sensors', loadChildren: './sensors/sensors.module#SensorsModule' },
{ path: 'systems', loadChildren: './systems/systems.module#SystemsModule' },
]
+ }, // passport
+ {
+ path: 'passport',
+ component: LayoutPassportComponent,
+ children: [
+ { path: 'login', component: UserLoginComponent }
+ ]
},
- { path: '**', redirectTo: 'dashboard' }
+ { path: '**', redirectTo: 'passport/login' }
];
@NgModule({
--
Gitblit v1.8.0