From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/reports/reports.module.ts | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/reports/reports.module.ts b/src/app/routes/reports/reports.module.ts
index 4cb1096..d5c29d7 100644
--- a/src/app/routes/reports/reports.module.ts
+++ b/src/app/routes/reports/reports.module.ts
@@ -6,22 +6,39 @@
import { DemoComponent } from './demo/demo.component';
import { ExcelComponent } from './excel/excel.component';
+import { QueryComponent } from './query/query.component';
+import { PipeModule } from '@business/pipe/pipe.module';
+import { NzTreeModule } from 'ng-tree-antd';
+import { NgxEchartsModule } from 'ngx-echarts';
+import { SensorsService } from '@business/services/http/sensors.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { AreacodeService } from '@business/services/http/areacode.service';
+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 = [
{
path: '',
children: [
+ { path: 'query', component: QueryComponent },
{ path: 'demo', component: DemoComponent },
- { path: 'excel', component: ExcelComponent }
-
+ { path: 'excel', component: ExcelComponent },
+ { path: 'alarm', component: AlarmComponent },
]
}
];
+
const COMPONENTS_NOROUNT = [ ];
@NgModule({
imports: [
+ // ������������������������������������
+ PipeModule,
+ NzTreeModule,
+ NgxEchartsModule,
CommonModule,
SharedModule,
RouterModule.forChild(routes)
@@ -29,8 +46,12 @@
declarations: [
...COMPONENTS_NOROUNT,
DemoComponent,
- ExcelComponent
+ ExcelComponent,
+ AlarmComponent,
+ QueryComponent
],
+ providers: [SensorsService, NzMessageService, AreacodeService,
+ MonitorPointService, DeviceService, DateService],
entryComponents: COMPONENTS_NOROUNT
})
export class ReportsModule { }
--
Gitblit v1.8.0