From 8570af7c6051c3d9a516f39d597ff49e1e1e2840 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 25 Jan 2018 09:31:37 +0800
Subject: [PATCH] 设备模块 坐标 校准值 配置 等功能
---
src/app/routes/devices/devices.module.ts | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/devices/devices.module.ts b/src/app/routes/devices/devices.module.ts
index 9ad3e5b..7a05990 100644
--- a/src/app/routes/devices/devices.module.ts
+++ b/src/app/routes/devices/devices.module.ts
@@ -1,3 +1,5 @@
+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';
@@ -17,8 +19,14 @@
import { VersionEditComponent } from './version/version-edit/version-edit.component';
import { MonitorPointEditComponent } from './monitor-point/monitor-point-edit/monitor-point-edit.component';
import { VersionSensorConfigComponent } from './version/version-sensor-config/version-sensor-config.component';
-
-const COMPONENTS_NOROUNT = [ VersionEditComponent, MonitorPointEditComponent, VersionSensorConfigComponent ];
+import { DeviceService } from '@business/services/http/device.service';
+import { DeviceEditComponent } from './basic-info/device-edit/device-edit.component';
+import { OperateUserService } from '@business/services/http/operate-user.service';
+import { AdjustConfigComponent } from './basic-info/adjust-config/adjust-config.component';
+import { CoordinatesPickerComponent } from 'app/routes/map/coordinates-picker/coordinates-picker.component';
+import { MapModule } from 'app/routes/map/map.module';
+import { CoorPickerService } from 'app/routes/map/coordinates-picker/coordinates-picker.service';
+const COMPONENTS_NOROUNT = [AdjustConfigComponent,DeviceEditComponent,VersionEditComponent, MonitorPointEditComponent, VersionSensorConfigComponent ];
const routes: Routes = [
{
@@ -37,17 +45,18 @@
PipeModule,
CommonModule,
SharedModule,
+ MapModule,
RouterModule.forChild(routes)
],
declarations: [
BasicInfoComponent,
VersionComponent,
MonitorPointComponent,
- ...COMPONENTS_NOROUNT
+ ...COMPONENTS_NOROUNT
],
- providers: [OrganizationService, VersionService,
+ providers: [CoorPickerService,DeviceAdjustValueService,OrganizationService, VersionService,
SensorsService, AreacodeService, MonitorPointService,
- _HttpClient, FormBuilder],
- entryComponents: COMPONENTS_NOROUNT
+ _HttpClient, FormBuilder,DeviceService,OperateUserService,ToolsService],
+ entryComponents: [CoordinatesPickerComponent,...COMPONENTS_NOROUNT]
})
export class DevicesModule { }
--
Gitblit v1.8.0