From fd7b11ec894b6f8c5cc736489c0f26eec35ad3ce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 11 May 2018 17:20:53 +0800
Subject: [PATCH] 设备 增加 行业

---
 src/app/routes/devices/basic-info/device-edit/device-edit.component.ts |   84 +++++++++++++++++++++++++----------------
 1 files changed, 51 insertions(+), 33 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 8158269..3fa4dfb 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
@@ -8,7 +8,10 @@
 import { Component, OnInit } from '@angular/core';
 import { Device} from '@business/entity/data';
 import { _Validators } from '@delon/abc';
-import { PageBean } from '@business/entity/grid';
+import { PageBean, ResultBean } from '@business/entity/grid';
+import { _HttpClient } from '@delon/theme';
+import { environment } from '@env/environment';
+import { debug } from 'util';
 
 @Component({
   selector: 'app-device-edit',
@@ -16,58 +19,73 @@
   styles: []
 })
 export class DeviceEditComponent implements OnInit {
-  public monitorPoints:any [] = [];
-  public deviceVersions:any [] = [];
-  public operateUsers:any [] = [];
+  public monitorPoints: any [] = [];
+  public professions: 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,
+    private  http:_HttpClient
   ) { }
-  data:Device;
-  validateForm:FormGroup;
+  data: Device;
+  validateForm: FormGroup;
   ngOnInit() {
     const data = this.data;
     this.monitorPointChange(null);
     this.deviceVersionChange(null);
     this.operateUserChange(null);
+    this.professionChange();
     if (this.data.createTime == null) {
         this.data.createTime = new Date().getTime();
     }
-    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]
+    debugger;
+    const validates: Device = {
+         name: [data.name, [Validators.required]],
+         mac: [data.mac, [Validators.required]],
+         deviceVersionId: [data.deviceVersionId],
+         monitorPointId: [data.monitorPointId],
+         professionId: [data.professionId],
+         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){
+   professionChange(){
+     this.http.get<ResultBean<any[]>>(environment.SERVER_BASH_URL+"profession/getall").subscribe(
+         result => {
+             if(!!result.code){
+                 debugger;
+                 this.professions = result.data;
+             }
+         }
+     );
+   }
+   monitorPointChange(text) {
     const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
     this.monitorPointService.getPagingList(pageBean, text).subscribe(
       (res: PageBean) => {
@@ -81,14 +99,14 @@
                       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) => {
@@ -102,14 +120,14 @@
                       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) => {
@@ -123,8 +141,8 @@
                       return item.id === operateUser.id;
                    }
                );
-               if ( hasSelectedValue ) {
-                  this.monitorPoints.push(operateUser);
+               if ( !hasSelectedValue ) {
+                  this.operateUsers.push(operateUser);
                }
            }
       }

--
Gitblit v1.8.0