From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/reports/reports.module.ts | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/reports/reports.module.ts b/src/app/routes/reports/reports.module.ts
index e050e3b..d5c29d7 100644
--- a/src/app/routes/reports/reports.module.ts
+++ b/src/app/routes/reports/reports.module.ts
@@ -16,6 +16,7 @@
import { MonitorPointService } from '@business/services/http/monitor-point.service';
import { DeviceService } from '@business/services/http/device.service';
import { DateService } from '@business/services/util/date.service';
+import { AlarmComponent } from './alarm/alarm.component';
const routes: Routes = [
{
@@ -24,10 +25,11 @@
{ path: 'query', component: QueryComponent },
{ path: 'demo', component: DemoComponent },
{ path: 'excel', component: ExcelComponent },
-
+ { path: 'alarm', component: AlarmComponent },
]
}
];
+
const COMPONENTS_NOROUNT = [ ];
@@ -45,6 +47,7 @@
...COMPONENTS_NOROUNT,
DemoComponent,
ExcelComponent,
+ AlarmComponent,
QueryComponent
],
providers: [SensorsService, NzMessageService, AreacodeService,
--
Gitblit v1.8.0