From 0e25153037b06851846e80cc745e518ba07bf7af Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 26 Mar 2018 13:58:16 +0800
Subject: [PATCH] 数据查询和表单模块合并,修改密码用户输入框去除

---
 src/app/routes/reports/reports.module.ts |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/reports/reports.module.ts b/src/app/routes/reports/reports.module.ts
index 4cb1096..e050e3b 100644
--- a/src/app/routes/reports/reports.module.ts
+++ b/src/app/routes/reports/reports.module.ts
@@ -6,14 +6,25 @@
 
 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';
 
 const routes: Routes = [
   {
     path: '',
     children: [
+      { path: 'query', component: QueryComponent },
       { path: 'demo', component: DemoComponent },
-      { path: 'excel', component: ExcelComponent }
-
+      { path: 'excel', component: ExcelComponent },
+    
     ]
   }
 ];
@@ -22,6 +33,10 @@
 
 @NgModule({
   imports: [
+    // ������������������������������������
+    PipeModule,
+    NzTreeModule,
+    NgxEchartsModule,
     CommonModule,
     SharedModule,
     RouterModule.forChild(routes)
@@ -29,8 +44,11 @@
   declarations: [
     ...COMPONENTS_NOROUNT,
     DemoComponent,
-    ExcelComponent
+    ExcelComponent,
+    QueryComponent
   ],
+  providers: [SensorsService, NzMessageService, AreacodeService,
+     MonitorPointService, DeviceService, DateService],
   entryComponents: COMPONENTS_NOROUNT
 })
 export class ReportsModule { }

--
Gitblit v1.8.0