From 60b58b47cecd7611ad8df2561a84bf0548ad6ad9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 20 Dec 2017 13:54:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git into develop
---
src/app/routes/routes.ts | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/routes.ts b/src/app/routes/routes.ts
index 3fc95af..047905b 100644
--- a/src/app/routes/routes.ts
+++ b/src/app/routes/routes.ts
@@ -13,9 +13,10 @@
{ path: '', redirectTo: 'dashboard/v1', pathMatch: 'full' },
{ path: 'dashboard', redirectTo: 'dashboard/v1', pathMatch: 'full' },
-
{ 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: 'dashboard/v1', component: DashboardV1Component, data: { translate: 'dashboard_v1' } },
{ path: 'dashboard/analysis', component: DashboardAnalysisComponent, data: { translate: 'dashboard_analysis' } },
--
Gitblit v1.8.0