From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
---
src/app/routes/routes-routing.module.ts | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 918d7de..84f64c1 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 { ReportComponent } from './report/report.component';
import { UserLoginComponent } from 'app/routes/passport/login/login.component';
@@ -18,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' } },
@@ -29,16 +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: [
- { path: 'login', component: UserLoginComponent }
+ {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