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/devices/devices.module.ts | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/app/routes/devices/devices.module.ts b/src/app/routes/devices/devices.module.ts
index efa7913..7a0a12d 100644
--- a/src/app/routes/devices/devices.module.ts
+++ b/src/app/routes/devices/devices.module.ts
@@ -1,5 +1,10 @@
-
-import { ToolsService } from './../../core/services/tools.service';
+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 { BasicInfoComponent } from './basic-info/basic-info.component';
@@ -7,13 +12,21 @@
import { MonitorPointComponent } from './monitor-point/monitor-point.component';
import {RouterModule, Routes} from '@angular/router';
import { SharedModule } from '@shared/shared.module';
-import { VersionService } from 'app/routes/devices/version/version.service';
import { Version } from '@angular/compiler/src/util';
import { _HttpClient } from '@delon/theme/services/http/http.client';
-import { AddOrEditComponent } from './version/add-or-edit/add-or-edit.component';
-import { PipeModule } from '@core/pipe/pipe.module';
-
-const COMPONENTS_NOROUNT = [ AddOrEditComponent ];
+import { PipeModule } from '@business/pipe/pipe.module';
+import { FormBuilder } from '@angular/forms';
+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';
+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 = [
{
@@ -28,20 +41,22 @@
@NgModule({
imports: [
- //������������������������������������
+ // ������������������������������������
PipeModule,
CommonModule,
SharedModule,
+ MapModule,
RouterModule.forChild(routes)
],
declarations: [
BasicInfoComponent,
VersionComponent,
MonitorPointComponent,
- ...COMPONENTS_NOROUNT,
- AddOrEditComponent
+ ...COMPONENTS_NOROUNT
],
- providers: [ToolsService, VersionService, _HttpClient],
- entryComponents: COMPONENTS_NOROUNT
+ providers: [CoorPickerService, DeviceAdjustValueService, OrganizationService, VersionService,
+ SensorsService, AreacodeService, MonitorPointService,
+ _HttpClient, FormBuilder, DeviceService, OperateUserService, ToolsService],
+ entryComponents: [CoordinatesPickerComponent, ...COMPONENTS_NOROUNT]
})
export class DevicesModule { }
--
Gitblit v1.8.0