From 0e25153037b06851846e80cc745e518ba07bf7af Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 26 Mar 2018 13:58:16 +0800
Subject: [PATCH] 数据查询和表单模块合并，修改密码用户输入框去除
---
src/app/routes/routes-routing.module.ts | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index e8f7f04..f026255 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -20,21 +20,16 @@
component: LayoutDefaultComponent,
children: [
{ path: '', redirectTo: 'dashboard/workplace', pathMatch: 'full' },
-<<<<<<< HEAD
- { path: 'dashboard', 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' } },
->>>>>>> 9634327c9094fb2d2b5bb2a3e630971cd65d3112
{ 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' },
{ path: 'systems', loadChildren: './systems/systems.module#SystemsModule' },
- { path: 'reports', loadChildren: './reports/reports.module#ReportsModule' },
- { path: 'analysis', loadChildren: './analysis/analysis.module#AnalysisModule' },
+ { path: 'reports', loadChildren: './reports/reports.module#ReportsModule' }
]
}, // passport
{
--
Gitblit v1.8.0