From 6a6d3bbb3748c12c2dc94beec05d21d82d0faba1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 14:43:01 +0800
Subject: [PATCH] 数据报表
---
src/app/routes/routes-routing.module.ts | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index a1d33a5..e8f7f04 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -20,7 +20,14 @@
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' },
--
Gitblit v1.8.0