From 7f762717c4580a17377a33cf04351fa3abaea61d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 15:25:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/routes.module.ts | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index c89de5e..c09bb38 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -12,6 +12,7 @@
import { DashboardAnalysisComponent } from './dashboard/analysis/analysis.component';
import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component';
import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.component';
+import { ReportComponent } from './report/report.component';
// Statics
import 'rxjs/add/observable/throw';
@@ -31,7 +32,8 @@
DashboardAnalysisComponent,
DashboardMonitorComponent,
DashboardWorkplaceComponent,
- UserLoginComponent
+ UserLoginComponent,
+ ReportComponent
],
providers: [
_HttpClient,
--
Gitblit v1.8.0