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 |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 8c628cf..f026255 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -19,32 +19,30 @@
         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' } },
             { path: 'dashboard/monitor', component: DashboardMonitorComponent, data: { translate: 'dashboard_monitor' } },
             { 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
     {
         path: 'passport',
         component: LayoutPassportComponent,
         children: [
-            {data:{title:'������������'}, path: 'login', component: UserLoginComponent }
+            {data: {title: '������������'}, path: 'login', component: UserLoginComponent }
         ]
     },    // passport
     {
       path: 'report',
       component: ReportComponent,
-      data:{title:'������������'}
+      data: {title: '������������'}
     },
     { path: '**', redirectTo: 'passport/login' }
 ];

--
Gitblit v1.8.0