From cc523dbe2dc5d3d72d8f82c9748f7fb5ccf87eb5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 23 Jul 2018 09:39:04 +0800
Subject: [PATCH] 导入device 组件
---
src/app/routes/devices/devices.module.ts | 5 ++++-
src/app/routes/map/map.module.ts | 4 ++--
src/app/routes/operation/operation.module.ts | 11 +++++------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/app/routes/devices/devices.module.ts b/src/app/routes/devices/devices.module.ts
index 7a0a12d..74ed046 100644
--- a/src/app/routes/devices/devices.module.ts
+++ b/src/app/routes/devices/devices.module.ts
@@ -26,7 +26,7 @@
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 COMPONENTS_NOROUNT = [AdjustConfigComponent, DeviceEditComponent, VersionEditComponent, MonitorPointEditComponent, VersionSensorConfigComponent];
const routes: Routes = [
{
@@ -54,6 +54,9 @@
MonitorPointComponent,
...COMPONENTS_NOROUNT
],
+ exports: [
+ COMPONENTS_NOROUNT
+ ],
providers: [CoorPickerService, DeviceAdjustValueService, OrganizationService, VersionService,
SensorsService, AreacodeService, MonitorPointService,
_HttpClient, FormBuilder, DeviceService, OperateUserService, ToolsService],
diff --git a/src/app/routes/map/map.module.ts b/src/app/routes/map/map.module.ts
index eea6ff3..b889eb8 100644
--- a/src/app/routes/map/map.module.ts
+++ b/src/app/routes/map/map.module.ts
@@ -1,9 +1,9 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { CoordinatesPickerComponent } from './coordinates-picker/coordinates-picker.component';
-import { Routes, RouterModule } from '@angular/router';
+// import { Routes, RouterModule } from '@angular/router';
import { BaiduMapModule } from 'angular2-baidu-map';
-import { AqmModule } from 'angular-qq-maps';
+// import { AqmModule } from 'angular-qq-maps';
import { SharedModule } from '@shared/shared.module';
diff --git a/src/app/routes/operation/operation.module.ts b/src/app/routes/operation/operation.module.ts
index b18ce68..e10b5cf 100644
--- a/src/app/routes/operation/operation.module.ts
+++ b/src/app/routes/operation/operation.module.ts
@@ -27,10 +27,8 @@
import { NzTreeModule } from 'ng-tree-antd';
import { NgxEchartsModule } from 'ngx-echarts';
import { DeviceMaintenanceComponent } from './device-maintenance/device-maintenance.component';
+import { DevicesModule } from '../devices/devices.module';
const COMPONENTS_NOROUNT = [];
-const COMPONENTS_IMPORT = [AdjustConfigComponent, DeviceEditComponent,
- VersionEditComponent, MonitorPointEditComponent,
- VersionSensorConfigComponent ];
const routes: Routes = [
{
@@ -52,17 +50,18 @@
CommonModule,
SharedModule,
MapModule,
- RouterModule.forChild(routes)
+ RouterModule.forChild(routes),
+ DevicesModule
],
declarations: [
DataAuditComponent,
DeviceStatusComponent,
DeviceMaintenanceComponent,
- ...COMPONENTS_NOROUNT
+ ...COMPONENTS_NOROUNT
],
providers: [CoorPickerService, DeviceAdjustValueService, OrganizationService, VersionService,
SensorsService, AreacodeService, MonitorPointService,
_HttpClient, FormBuilder, DeviceService, OperateUserService, ToolsService],
- entryComponents: [...COMPONENTS_NOROUNT,...COMPONENTS_IMPORT]
+ entryComponents: [...COMPONENTS_NOROUNT]
})
export class OperationModule { }
--
Gitblit v1.8.0