From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动

---
 src/app/routes/devices/basic-info/basic-info.component.html |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/devices/basic-info/basic-info.component.html b/src/app/routes/devices/basic-info/basic-info.component.html
index 6103db8..3c5a796 100644
--- a/src/app/routes/devices/basic-info/basic-info.component.html
+++ b/src/app/routes/devices/basic-info/basic-info.component.html
@@ -1,3 +1,51 @@
-<p>
-  device basic-info works!
-</p>
+<div class="content__title">
+    <h1>
+        ������������
+        <small>���������������������������������������������������������</small>
+    </h1>
+</div>
+<nz-card [nzBordered]="false">
+    <div nz-row class="mb-sm">
+        <div  nz-col [nzSpan]="4">
+                <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
+                    <i class="anticon anticon-plus"></i><span>������</span>
+                </button>
+                <ng-container *ngIf="selectedRows.length > 0">
+                <button nz-button [nzSize]="'large'" (click)="deleteSelected()">������������</button>
+                </ng-container>
+        </div>
+        <div  nz-col [nzSpan]="7">
+              <span style="padding: 5px 10px;">
+                ������:                  
+              </span>
+              <nz-select style="width: 79%;" [(ngModel)]="queryMap.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>
+        </div>
+        <div  nz-col [nzSpan]="7">
+                <span style="padding: 5px 10px;">
+                        ���������:                  
+                      </span>
+                      <nz-select style="width: 75%;" [(ngModel)]="queryMap.mpointId" (ngModelChange)="setMpointId($event)" [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-col [nzSpan]="6">
+                <nz-input [ngStyle]="{'width': '240px','float':'right'}" [(ngModel)]="queryText" name=""  [nzPlaceHolder]="'������������������������������mac'"
+                (keyup)="queryTextChanged($event)" (change)="queryTextChanged($event)" ></nz-input>
+        </div>
+    </div>
+    <div class="mb-md">
+            <nz-alert *ngIf="selectedRows.length > 0" [nzType]="'info'" [nzShowIcon]="true"> 
+                <span alert-body>
+                    ���������<strong class="text-primary">{{selectedRows.length}}</strong>���
+                </span> 
+            </nz-alert>
+    </div>
+<simple-table #simpleTable  [data]="listUrl" [extraParams]="extraParams"  [columns]="columns" [showTotal]="true"
+[reqReName]="{pi: 'pageIndex',ps: 'pageSize'}"  (checkboxChange)="checkboxChange($event)" [ps]="10" [resReName]="{list: 'data',total: 'total'}"></simple-table>
+</nz-card>

--
Gitblit v1.8.0