Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-16 bd1966ac64e93a610a4635c3eefd5115ab825c5b

 src/app/routes/devices/monitor-point/monitor-point.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"> &nbsp;
@@ -54,9 +54,11 @@
                    <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>
                            </nz-popconfirm>
                            <span nz-table-divider></span>
                            <a (click)="configCoord(row)">配置坐标</a>                            
                     </td>
                </tr>
              </tbody>