From b8b94e846dcde8680deff869ea65caee23c3bc89 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 03 Apr 2018 10:56:14 +0800
Subject: [PATCH] 报表优化

---
 src/app/routes/devices/basic-info/device-edit/device-edit.component.ts |   76 +++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
index fc97214..c128c0f 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
@@ -16,19 +16,19 @@
   styles: []
 })
 export class DeviceEditComponent implements OnInit {
-  public monitorPoints:any [] = [];
-  public deviceVersions:any [] = [];
-  public operateUsers:any [] = [];
+  public monitorPoints: any [] = [];
+  public deviceVersions: any [] = [];
+  public operateUsers: any [] = [];
   public isSaving = false;
   constructor(
     private subject: NzModalSubject,
     private formBuilder: FormBuilder,
-    private monitorPointService:MonitorPointService,
-    private versionService:VersionService,
-    private operateUserService:OperateUserService
+    private monitorPointService: MonitorPointService,
+    private versionService: VersionService,
+    private operateUserService: OperateUserService
   ) { }
-  data:Device;
-  validateForm:FormGroup;
+  data: Device;
+  validateForm: FormGroup;
   ngOnInit() {
     const data = this.data;
     this.monitorPointChange(null);
@@ -37,41 +37,41 @@
     if (this.data.createTime == null) {
         this.data.createTime = new Date().getTime();
     }
-    const validates:Device = {
-         name:[data.name,[Validators.required]],
-         mac:[data.mac],
-         deviceVersionId:[data.deviceVersionId],
-         monitorPointId:[data.monitorPointId],
-         operateUserId:[data.operateUserId],
-         address:[data.address],
-         id:[data.id],
-         longitude:[data.longitude],
-         latitude:[data.latitude],
-         createTime:[data.createTime],
-         installTime:[data.installTime]
+    const validates: Device = {
+         name: [data.name, [Validators.required]],
+         mac: [data.mac, [Validators.required]],
+         deviceVersionId: [data.deviceVersionId],
+         monitorPointId: [data.monitorPointId],
+         operateUserId: [data.operateUserId],
+         address: [data.address],
+         id: [data.id],
+         longitude: [data.longitude],
+         latitude: [data.latitude],
+         createTime: [data.createTime],
+         installTime: [data.installTime]
     };
     this.validateForm = this.formBuilder.group(
       validates
     );
   }
-  close(){
+  close() {
      this.subject.destroy();
    }
-   save($event, value, valid){
+   save($event, value, valid) {
     $event.preventDefault();
-    if(valid){
+    if (valid) {
       this.isSaving = true;
       this.data = value;
       this.subject.next( this );
-    }else{
+    } else {
         ToolsService.markAsDirty(this.validateForm);
     }
    }
-   monitorPointChange(text){
+   monitorPointChange(text) {
     const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
     this.monitorPointService.getPagingList(pageBean, text).subscribe(
       (res: PageBean) => {
-           if (res != null && res.data != null) {               
+           if (res != null && res.data != null) {
                this.monitorPoints = res.data;
            }
            const monitorPoint = this.data.monitorPoint;
@@ -81,18 +81,18 @@
                       return item.id === monitorPoint.id;
                    }
                );
-               if ( hasSelectedValue ) {
+               if ( !hasSelectedValue ) {
                   this.monitorPoints.push(monitorPoint);
-               }                     
+               }
            }
       }
    );
    }
-   deviceVersionChange(text){
+   deviceVersionChange(text) {
     const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
     this.versionService.getPagingList(pageBean, text).subscribe(
       (res: PageBean) => {
-           if (res != null && res.data != null) {               
+           if (res != null && res.data != null) {
                this.deviceVersions = res.data;
            }
            const deviceVersion = this.data.deviceVersion;
@@ -102,18 +102,18 @@
                       return item.id === deviceVersion.id;
                    }
                );
-               if ( hasSelectedValue ) {
-                  this.monitorPoints.push(deviceVersion);
-               }                     
+               if ( !hasSelectedValue ) {
+                  this.deviceVersions.push(deviceVersion);
+               }
            }
       }
    );
    }
-   operateUserChange(text){
+   operateUserChange(text) {
     const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
     this.operateUserService.getPagingList(pageBean, text).subscribe(
       (res: PageBean) => {
-           if (res != null && res.data != null) {               
+           if (res != null && res.data != null) {
                this.operateUsers = res.data;
            }
            const operateUser = this.data.operateUser;
@@ -123,9 +123,9 @@
                       return item.id === operateUser.id;
                    }
                );
-               if ( hasSelectedValue ) {
-                  this.monitorPoints.push(operateUser);
-               }                     
+               if ( !hasSelectedValue ) {
+                  this.operateUsers.push(operateUser);
+               }
            }
       }
    );

--
Gitblit v1.8.0