From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
---
src/app/routes/devices/devices.module.ts | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/devices/devices.module.ts b/src/app/routes/devices/devices.module.ts
index 7a05990..7a0a12d 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,9 +54,9 @@
MonitorPointComponent,
...COMPONENTS_NOROUNT
],
- providers: [CoorPickerService,DeviceAdjustValueService,OrganizationService, VersionService,
+ providers: [CoorPickerService, DeviceAdjustValueService, OrganizationService, VersionService,
SensorsService, AreacodeService, MonitorPointService,
- _HttpClient, FormBuilder,DeviceService,OperateUserService,ToolsService],
- entryComponents: [CoordinatesPickerComponent,...COMPONENTS_NOROUNT]
+ _HttpClient, FormBuilder, DeviceService, OperateUserService, ToolsService],
+ entryComponents: [CoordinatesPickerComponent, ...COMPONENTS_NOROUNT]
})
export class DevicesModule { }
--
Gitblit v1.8.0