From 43f2601b8a5706a029f333204f7f52f153d61dfe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/routes-routing.module.ts | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 016b94a..367fd3a 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -31,18 +31,20 @@
{ 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
+ component: ReportComponent,
+ data:{title:'������������'}
},
{ path: '**', redirectTo: 'passport/login' }
];
--
Gitblit v1.8.0