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/monitor-point/monitor-point.component.html | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/devices/monitor-point/monitor-point.component.html b/src/app/routes/devices/monitor-point/monitor-point.component.html
index fd431c6..bf46e24 100644
--- a/src/app/routes/devices/monitor-point/monitor-point.component.html
+++ b/src/app/routes/devices/monitor-point/monitor-point.component.html
@@ -1,14 +1,28 @@
<pro-header [title]="grid.title"></pro-header>
<nz-card [nzBordered]="false">
- <div class="mb-md">
- <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
+ <div nz-row class="mb-sm">
+ <div nz-col [nzSpan]="6">
+ <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
<i class="anticon anticon-plus"></i><span>������</span>
</button>
<ng-container *ngIf="grid.selectedIndexs.length > 0">
<button nz-button [nzSize]="'large'" (click)="deleteSelected()">������������</button>
</ng-container>
- <nz-input [ngStyle]="{'width': '280px','float':'right'}" [(ngModel)]="queryMap.value" name="" [nzPlaceHolder]="queryMap.text"
- (keyup)="queryTextChanged($event)" (change)="queryTextChanged($event)" ></nz-input>
+ </div>
+ <div nz-col style="text-align:right;padding: 5px 10px;" [nzSm]="6" [nzXs]="24">
+ <label>���������</label>
+ </div>
+ <div nz-col [nzSpan]="6">
+ <nz-select style="width: 90%;" [(ngModel)]="queryMap.organizationId" (ngModelChange)="setOrganizationId($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]="6">
+ <nz-input [(ngModel)]="queryMap.mpointName" name="" [nzPlaceHolder]="'������������������������'"
+ (keyup)="queryTextChanged($event)" (change)="queryTextChanged($event)" ></nz-input>
+ </div>
</div>
<div class="mb-md">
<nz-alert *ngIf="grid.selectedIndexs.length > 0" [nzType]="'info'" [nzShowIcon]="true">
@@ -54,9 +68,11 @@
<td nz-td>
<a (click)="addOrModify(row)">������</a>
<span nz-table-divider></span>
- <nz-popconfirm [nzTitle]="'������������������'+grid.title+'���?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(row.id)" >
+ <nz-popconfirm [nzTitle]="'������������������'+grid.title+'���?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(row.id)" >
<a nz-popconfirm>������</a>
- </nz-popconfirm>
+ </nz-popconfirm>
+ <span nz-table-divider></span>
+ <a (click)="configCoord(row)">������������</a>
</td>
</tr>
</tbody>
--
Gitblit v1.8.0