From 9200567a17b5a567ed14529fa0208618b4867938 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 05 Jul 2018 16:03:25 +0800
Subject: [PATCH] 设备型号配置优化
---
src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html | 86 +++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html b/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html
index b12c73c..39170e9 100644
--- a/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html
+++ b/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html
@@ -1,39 +1,55 @@
<div class="modal-header">
- <div class="modal-title">���������������</div>
+ <div class="modal-title">���������������</div>
</div>
-<nz-table #nzTable [nzDataSource]="grid.data" [nzPageSize]="8"
- [nzLoading]="grid.loading" [nzShowTotal]="true">
- <thead nz-thead>
- <tr>
- <th nz-th [nzCheckbox]="true">
- <label nz-checkbox [(ngModel)]="grid.allChecked" [nzIndeterminate]="grid.indeterminate" (ngModelChange)="grid.checkAll($event)"></label>
- </th>
- <th nz-th *ngFor="let col of grid.columns" [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
- <span>{{ col.text }}</span>
- <nz-table-sort *ngIf="col.isSort" [(nzValue)]="col.sort" (nzValueChange)="sort(col.name,$event)"></nz-table-sort>
- </th>
- </tr>
- </thead>
- <tbody nz-tbody>
- <tr nz-tbody-tr *ngFor="let row of nzTable.data">
- <td nz-td [nzCheckbox]="true">
- <label nz-checkbox [(ngModel)]="row.checked" (ngModelChange)="grid.refreshStatus($event)"></label>
- </td>
- <td nz-td *ngFor="let col of grid.columns" [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
- <span [ngSwitch]="col.type">
- <!-- ������������������������������������ -->
- <span *ngSwitchDefault> {{ row[col.name]|tyepHandle:col:row }} </span>
- <!-- ������������������������������������ -->
- </span>
- </td>
- </tr>
- </tbody>
-</nz-table>
+<nz-row nzGutter="0">
+ <nz-col nzSpan="24" style="height: 520px;">
+ <nz-table #nzTable [nzDataSource]="gridDataImage" [nzPageSize]="8" [nzLoading]="grid.loading" [nzShowTotal]="true">
+ <thead nz-thead>
+ <tr>
+ <th nz-th>
+ </th>
+ <th nz-th *ngFor="let col of grid.columns;let i = index;" [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
+ <span>{{ col.text }}</span>
+ <ng-container *ngIf="i === 0">
+ <span>
+ {{ '('+selectedCount+'/'+grid.data.length+')' }}
+ </span>
+ <nz-table-sort [(nzValue)]="col.sort" (nzValueChange)="sort(col.name,$event)"></nz-table-sort>
+ <nz-dropdown [nzTrigger]="'click'" [nzClickHide]="false">
+ <i class="anticon anticon-search ant-table-filter-icon" nz-dropdown></i>
+ <div nz-dropdown-custom class="custom-filter-dropdown">
+ <nz-input [nzPlaceHolder]="'������������'" [ngModel]="searchValue" (ngModelChange)="setSearchValue($event)"></nz-input>
+ </div>
+ </nz-dropdown>
+ </ng-container>
+ </th>
+ </tr>
+ </thead>
+ <tbody nz-tbody>
+ <ng-container *ngFor="let row of nzTable.data">
+ <tr nz-tbody-tr>
+ <td nz-td [nzCheckbox]="true">
+ <label nz-checkbox [(ngModel)]="row.checked" (ngModelChange)="grid.refreshStatus($event)"></label>
+ </td>
+ <td nz-td *ngFor="let col of grid.columns" [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
+ <span [ngSwitch]="col.type">
+ <!-- ������������������������������������ -->
+ <span *ngSwitchDefault> {{ row[col.name]|tyepHandle:col:row }} </span>
+ <!-- ������������������������������������ -->
+ </span>
+ </td>
+ </tr>
+ </ng-container>
+ </tbody>
+ </nz-table>
+ </nz-col>
+</nz-row>
<div class="modal-footer">
- <button nz-button type="button" (click)="close()">������</button>
- <button nz-button [nzType]="'primary'" (click)="save($event,null,null)" [nzLoading]="isSaving">
- <span >
- ������<span *ngIf="isSaving" >���</span>
- </span>
- </button>
+ <button nz-button type="button" (click)="close()">������</button>
+ <button nz-button [nzType]="'primary'" (click)="save($event,null,null)" [nzLoading]="isSaving">
+ <span>
+ ������
+ <span *ngIf="isSaving">���</span>
+ </span>
+ </button>
</div>
--
Gitblit v1.8.0