From ef5b73ea0b7aed593312f728638d84b5358458ae Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 13 Jul 2018 14:35:00 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
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 d5c29d7..9116760 100644
--- a/src/app/routes/reports/reports.module.ts
+++ b/src/app/routes/reports/reports.module.ts
@@ -7,6 +7,7 @@
import { DemoComponent } from './demo/demo.component';
import { ExcelComponent } from './excel/excel.component';
import { QueryComponent } from './query/query.component';
+import { Query2Component } from './query2/query2.component';
import { PipeModule } from '@business/pipe/pipe.module';
import { NzTreeModule } from 'ng-tree-antd';
import { NgxEchartsModule } from 'ngx-echarts';
@@ -26,6 +27,7 @@
{ path: 'demo', component: DemoComponent },
{ path: 'excel', component: ExcelComponent },
{ path: 'alarm', component: AlarmComponent },
+ { path: 'query2', component: Query2Component },
]
}
];
@@ -48,7 +50,8 @@
DemoComponent,
ExcelComponent,
AlarmComponent,
- QueryComponent
+ QueryComponent,
+ Query2Component
],
providers: [SensorsService, NzMessageService, AreacodeService,
MonitorPointService, DeviceService, DateService],
--
Gitblit v1.8.0