From c69ddde7828d777f04c6468c269aaa0aa03d72c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 02 Aug 2018 09:50:58 +0800
Subject: [PATCH] 文件修改
---
src/app/routes/operation/operation.module.ts | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/app/routes/operation/operation.module.ts b/src/app/routes/operation/operation.module.ts
index b18ce68..738d9db 100644
--- a/src/app/routes/operation/operation.module.ts
+++ b/src/app/routes/operation/operation.module.ts
@@ -14,9 +14,9 @@
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 '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';
+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';
@@ -27,10 +27,10 @@
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';
+import { DeviceDataComponent } from './device-data/device-data.component';
+import { DeviceControllerComponent } from './device-controller/device-controller.component';
const COMPONENTS_NOROUNT = [];
-const COMPONENTS_IMPORT = [AdjustConfigComponent, DeviceEditComponent,
- VersionEditComponent, MonitorPointEditComponent,
- VersionSensorConfigComponent ];
const routes: Routes = [
{
@@ -38,7 +38,9 @@
children: [
{ path: 'data-audit', component: DataAuditComponent },
{ path: 'device-status', component: DeviceStatusComponent },
- { path: 'device-maintenance', component: DeviceMaintenanceComponent }
+ { path: 'device-maintenance', component: DeviceMaintenanceComponent },
+ { path: 'device-data', component: DeviceDataComponent },
+ { path: 'device-controller', component: DeviceControllerComponent },
]
}
];
@@ -52,17 +54,20 @@
CommonModule,
SharedModule,
MapModule,
- RouterModule.forChild(routes)
+ RouterModule.forChild(routes),
+ DevicesModule
],
declarations: [
+ ...COMPONENTS_NOROUNT,
DataAuditComponent,
DeviceStatusComponent,
DeviceMaintenanceComponent,
- ...COMPONENTS_NOROUNT
+ DeviceDataComponent,
+ DeviceControllerComponent ,
],
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