From 3517e796f650b8aed52165c1a5905456f54033ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 10 Jan 2018 14:31:40 +0800
Subject: [PATCH] 项目路径 配置，以适应可能的框架更新
---
src/app/routes/devices/version/version.component.html | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/devices/version/version.component.html b/src/app/routes/devices/version/version.component.html
index 69d1282..31d2d18 100644
--- a/src/app/routes/devices/version/version.component.html
+++ b/src/app/routes/devices/version/version.component.html
@@ -22,10 +22,9 @@
[nzTotal]="grid.total"
[(nzPageIndex)]="grid.pageIndex"
[(nzPageSize)]="grid.pageSize"
- [nzLoading]="versionService.loading"
+ [nzLoading]="grid.loading"
[nzShowTotal]="true"
- (nzPageIndexChange)="load()"
- (nzDataChange)="dataChange($event)">
+ (nzPageIndexChange)="load()">
<thead nz-thead>
<tr>
<th nz-th [nzCheckbox]="true">
@@ -34,6 +33,7 @@
<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>
<th nz-th><span>������</span></th>
</tr>
@@ -47,16 +47,18 @@
[ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
<span [ngSwitch]="col.type">
<!-- ������������������������������������ -->
- <span *ngSwitchDefault> {{ row[col.name]|tyepHandle:col }} </span>
+ <span *ngSwitchDefault> {{ row[col.name]|tyepHandle:col:row}} </span>
<!-- ������������������������������������ -->
</span>
</td>
<td nz-td>
<a (click)="addOrModify(row)">������</a>
<span nz-table-divider></span>
- <nz-popconfirm [nzTitle]="'���������������������������?'" [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>
+ <span nz-table-divider></span>
+ <a (click)="configSensor(row)">���������������</a>
</td>
</tr>
</tbody>
--
Gitblit v1.8.0