From a3913c2a56783ca3b179f82c37b7048e80d55ca2 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 03 Aug 2018 10:57:21 +0800
Subject: [PATCH] 警报次数 显示

---
 src/app/routes/operation/operation.module.ts |   87 +++++++++++++++++++++++++++----------------
 1 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/src/app/routes/operation/operation.module.ts b/src/app/routes/operation/operation.module.ts
index d0be61d..738d9db 100644
--- a/src/app/routes/operation/operation.module.ts
+++ b/src/app/routes/operation/operation.module.ts
@@ -1,52 +1,73 @@
+import { DeviceAdjustValueService } from '@business/services/http/device-adjust-value.service';
+import { ToolsService } from '@business/services/util/tools.service';
+import { SensorsService } from '@business/services/http/sensors.service';
+import { OrganizationService } from '@business/services/http/organization.service';
+import { MonitorPointService } from '@business/services/http/monitor-point.service';
+import { VersionService } from '@business/services/http/version.service';
+import { AreacodeService } from '@business/services/http/areacode.service';
 import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import {RouterModule, Routes} from '@angular/router';
 import { SharedModule } from '@shared/shared.module';
+import { _HttpClient } from '@delon/theme/services/http/http.client';
+import { PipeModule } from '@business/pipe/pipe.module';
+import { FormBuilder } from '@angular/forms';
+import { DeviceService } from '@business/services/http/device.service';
+import { OperateUserService } from '@business/services/http/operate-user.service';
+import { CoordinatesPickerComponent } from '../map/coordinates-picker/coordinates-picker.component';
+import { MapModule } from '../map/map.module';
+import { CoorPickerService } from '../map/coordinates-picker/coordinates-picker.service';
+import { AdjustConfigComponent } from '../devices/basic-info/adjust-config/adjust-config.component';
+import { DeviceEditComponent } from '../devices/basic-info/device-edit/device-edit.component';
+import { VersionEditComponent } from '../devices/version/version-edit/version-edit.component';
+import { MonitorPointEditComponent } from '../devices/monitor-point/monitor-point-edit/monitor-point-edit.component';
+import { VersionSensorConfigComponent } from '../devices/version/version-sensor-config/version-sensor-config.component';
 import { DataAuditComponent } from './data-audit/data-audit.component';
 import { DeviceStatusComponent } from './device-status/device-status.component';
-import { DeviceMaintenanceComponent } from './device-maintenance/device-maintenance.component';
-import { PipeModule } from '@business/pipe/pipe.module';
-import { CommonModule } from '@angular/common';
-import { RouterModule, Routes } from '@angular/router';
-import { NgxEchartsModule } from 'ngx-echarts';
 import { NzTreeModule } from 'ng-tree-antd';
-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 { NgxEchartsModule } from 'ngx-echarts';
+import { DeviceMaintenanceComponent } from './device-maintenance/device-maintenance.component';
+import { DevicesModule } from '../devices/devices.module';
+import { DeviceDataComponent } from './device-data/device-data.component';
+import { DeviceControllerComponent } from './device-controller/device-controller.component';
+const COMPONENTS_NOROUNT = [];
 
-
-const COMPONENT_NOROUNT = [];
-
-const routes: Routes = [
-  {
-    path: '',
-    children: [
-      { path: 'data-audit', component: DataAuditComponent },
-      { path: 'device-status', component: DeviceStatusComponent },
-      { path: 'device-maintenance', component: DeviceMaintenanceComponent }
-    ]
-  }
-];
+  const routes: Routes = [
+    {
+      path: '',
+      children: [
+        { path: 'data-audit', component: DataAuditComponent },
+        { path: 'device-status', component: DeviceStatusComponent },
+        { path: 'device-maintenance', component: DeviceMaintenanceComponent },
+        { path: 'device-data', component: DeviceDataComponent },
+        { path: 'device-controller', component: DeviceControllerComponent },
+      ]
+    }
+  ];
 
 @NgModule({
   imports: [
     // ������������������������������������
     PipeModule,
-    NzTreeModule,
     NgxEchartsModule,
+    NzTreeModule,
     CommonModule,
     SharedModule,
-    RouterModule.forChild(routes)
+    MapModule,
+    RouterModule.forChild(routes),
+    DevicesModule
   ],
   declarations: [
-      ...COMPONENT_NOROUNT,
-      DataAuditComponent,
-      DeviceStatusComponent,
-      DeviceMaintenanceComponent,
+    ...COMPONENTS_NOROUNT,
+    DataAuditComponent,
+    DeviceStatusComponent,
+    DeviceMaintenanceComponent,
+    DeviceDataComponent,
+    DeviceControllerComponent ,   
   ],
-  entryComponents: COMPONENT_NOROUNT,
-  providers: [SensorsService, NzMessageService, AreacodeService,
-    MonitorPointService, DeviceService, DateService],
+  providers: [CoorPickerService, DeviceAdjustValueService, OrganizationService, VersionService, 
+    SensorsService, AreacodeService, MonitorPointService,
+    _HttpClient, FormBuilder, DeviceService, OperateUserService, ToolsService],
+  entryComponents: [...COMPONENTS_NOROUNT]
 })
 export class OperationModule { }

--
Gitblit v1.8.0