From 09074f01208062343f3c456bafe2a5f1115f2b2a Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:08:40 +0800
Subject: [PATCH] debug

---
 src/app/routes/routes-routing.module.ts |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 891e3f5..959203c 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -10,6 +10,8 @@
 import { DashboardAnalysisComponent } from './dashboard/analysis/analysis.component';
 import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component';
 import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.component';
+import { ReportComponent } from './report/report.component';
+import { UserLoginComponent } from 'app/routes/passport/login/login.component';
 
 
 const routes: Routes = [
@@ -17,7 +19,7 @@
         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' } },
@@ -28,9 +30,23 @@
             { 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 }
+        ]
+    },    // passport
+    {
+      path: 'report',
+      component: ReportComponent,
+      data:{title:'������������'}
     },
-    { path: '**', redirectTo: 'dashboard' }
+    { path: '**', redirectTo: 'passport/login' }
 ];
 
 @NgModule({

--
Gitblit v1.8.0