From 7ca521e4267b987270f6ccbb9a6c076aeb467d96 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:11:33 +0800
Subject: [PATCH] 设备，监控站 管理功能增强

---
 src/app/routes/devices/basic-info/device-edit/device-edit.component.html |   68 ++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.html b/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
index 840dbd7..9816dc7 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
@@ -11,7 +11,7 @@
             </nz-input>
           </div>
           <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
-            <label>mac</label>
+            <label nz-form-item-required>mac</label>
           </div>
           <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
                 <nz-input formControlName="mac" maxlength="20" [nzPlaceHolder]="'mac������'">
@@ -57,43 +57,65 @@
                     </nz-option>
                   </nz-select>
               </div>
-          </div>  
+          </div>
           <div nz-form-item  nz-row class="mb-sm">
             <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
-              <label>���������</label>
+              <label>������������</label>
             </div>
             <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
-                <nz-select formControlName="monitorPointId" [nzPlaceHolder]="'������ ���������(������������������)'"
+                <nz-datepicker nzSize="large"  style="width: 100%;" formControlName="createTime" nzShowTime  [nzPlaceHolder]="'������������'"
+                [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
+            </div>
+            <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
+              <label>������������</label>
+            </div>
+            <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
+                <nz-datepicker nzSize="large"  style="width: 100%;" formControlName="installTime" nzShowTime  [nzPlaceHolder]="'������������'"
+                [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
+            </div>
+          </div>
+          <div nz-form-item  nz-row class="mb-sm">
+            <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
+              <label>������������</label>
+            </div>
+            <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
+                <nz-select formControlName="monitorPointId" [nzPlaceHolder]="'������ ������������(������������������)'"
                 nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
                   <nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
                   </nz-option>
                 </nz-select>
             </div>
             <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
-              <label>������������</label>
+              <label>������</label>
             </div>
             <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
+                <nz-select formControlName="professionId" [nzPlaceHolder]="'������ ������������'"
+                nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
+                  <nz-option *ngFor="let option of professions" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
+                  </nz-option>
+                </nz-select>
+            </div>
+          </div>
+          <div nz-form-item  nz-row class="mb-sm">
+            <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
+              <label>������������</label>
+            </div>
+            <div nz-form-control nz-col [nzSpan]="10" nzHasFeedback>
                 <nz-input formControlName="address" maxlength="20" [nzPlaceHolder]="'���������������������������'">
                 </nz-input>
             </div>
-          </div>   
-          <div nz-form-item  nz-row class="mb-sm">
-              <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
-                <label>������������</label>
-              </div>
-              <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
-                  <nz-datepicker nzSize="large"  style="width: 100%;" formControlName="createTime" nzShowTime  [nzPlaceHolder]="'������������'"
-                  [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>          
-              </div>
-              <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
-                <label>������������</label>
-              </div>
-              <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
-                  <nz-datepicker nzSize="large"  style="width: 100%;" formControlName="installTime" nzShowTime  [nzPlaceHolder]="'������������'"
-                  [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>          
-              </div>
-            </div>   
+          </div>
+  </form>   
     <div class="modal-footer">
+         <span style="padding: 5px 10px;">
+            ������:                  
+          </span>
+          <nz-select style="width: 240px;" [(ngModel)]="configMap.orgId" (ngModelChange)="setOrgId($event)" [nzPlaceHolder]="'������ ������(������������������)'"
+            nzAllowClear [nzFilter]="false" nzShowSearch  (nzSearchChange)="orgSelectChange($event)" [nzNotFoundContent]="'������������'" >
+            <nz-option *ngFor="let option of orgOptions" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
+            </nz-option>
+          </nz-select>
+          &nbsp;
         <button nz-button type="button" (click)="close()">������</button>
         <button nz-button [nzType]="'primary'" [nzLoading]="isSaving">
           <span>
@@ -102,4 +124,4 @@
           </span>
         </button>
     </div>
-  </form>
\ No newline at end of file
+

--
Gitblit v1.8.0