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 |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/devices/version/version.component.html b/src/app/routes/devices/version/version.component.html
index 9dc93f3..31d2d18 100644
--- a/src/app/routes/devices/version/version.component.html
+++ b/src/app/routes/devices/version/version.component.html
@@ -1,11 +1,11 @@
 <pro-header [title]="grid.title"></pro-header>
 <nz-card [nzBordered]="false">
     	<div class="mb-md">
-                <button nz-button (click)="add()" [nzType]="'primary'" [nzSize]="'large'">
+                <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
                     <i class="anticon anticon-plus"></i><span>������</span>
                 </button>
                 <ng-container *ngIf="grid.selectedIndexs.length > 0"> &nbsp;
-                <button nz-button [nzSize]="'large'" (click)="remove()">������������</button>
+                <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>
@@ -22,10 +22,9 @@
               [nzTotal]="grid.total"
               [(nzPageIndex)]="grid.pageIndex"
               [(nzPageSize)]="grid.pageSize"
-              [nzLoading]="http.loading"
+              [nzLoading]="grid.loading"
               [nzShowTotal]="true"
-              (nzPageIndexChange)="load()"
-              (nzDataChange)="dataChange($event)">
+              (nzPageIndexChange)="load()">
               <thead nz-thead>
                   <tr>
                     <th nz-th [nzCheckbox]="true">
@@ -34,7 +33,9 @@
                     <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>
               </thead>
               <tbody nz-tbody>
@@ -46,10 +47,19 @@
                     [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]="'������������������'+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>
               </nz-table>

--
Gitblit v1.8.0