From 87393cfec0e482f1d0c1d36196a4788b104df859 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 29 Mar 2018 10:45:03 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/devices/version/version.component.html | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/devices/version/version.component.html b/src/app/routes/devices/version/version.component.html
index ba633d3..507b190 100644
--- a/src/app/routes/devices/version/version.component.html
+++ b/src/app/routes/devices/version/version.component.html
@@ -1,7 +1,7 @@
<pro-header [title]="grid.title"></pro-header>
<nz-card [nzBordered]="false">
<div class="mb-md">
- <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
+ <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">
@@ -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