From 325fcff34959e7b184675fdbafa14d439cf6b066 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 09 Jan 2018 16:31:45 +0800
Subject: [PATCH] 报警用户管理
---
src/app/routes/users/alarm-user/alarm-user.component.html | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/users/alarm-user/alarm-user.component.html b/src/app/routes/users/alarm-user/alarm-user.component.html
index d5d0d02..fca1838 100644
--- a/src/app/routes/users/alarm-user/alarm-user.component.html
+++ b/src/app/routes/users/alarm-user/alarm-user.component.html
@@ -5,10 +5,10 @@
<div nz-col [nzSpan]="8" class="mb-md">
<div nz-form-item class="d-flex">
<div nz-form-label>
- <label>������</label>
+ <label>���������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-input [(ngModel)]="query.name" name="name" [nzSize]="'large'" [nzPlaceHolder]="'���������������'"></nz-input>
+ <nz-input [(ngModel)]="query.name" name="name" [nzSize]="'large'" [nzPlaceHolder]="'������������������'"></nz-input>
</div>
</div>
</div>
@@ -29,7 +29,7 @@
</div>
<div nz-form-control class="flex-1">
<nz-select [(ngModel)]="query.isDelete" name="isDelete" [nzSize]="'large'">
- <nz-option *ngFor="let option of options" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
+ <nz-option *ngFor="let option of isDeleteOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
</nz-select>
</div>
</div>
@@ -43,7 +43,7 @@
</form>
<div class="mb-md">
- <button nz-button (click)="add()" [nzType]="'primary'" [nzSize]="'large'">
+ <button nz-button (click)="edit()" [nzType]="'primary'" [nzSize]="'large'">
<i class="anticon anticon-plus"></i><span>������</span>
</button>
<ng-container *ngIf="selectedRows.length > 0">
@@ -61,7 +61,7 @@
<nz-table #nzTable
[nzAjaxData]="data"
- [nzLoading]="http.loading"
+ [nzLoading]="loading"
[nzTotal]="total"
[(nzPageIndex)]="query.pageIndex"
[nzPageSize]="query.pageSize"
@@ -72,7 +72,7 @@
<th nz-th [nzCheckbox]="true">
<label nz-checkbox [(ngModel)]="allChecked" [nzIndeterminate]="indeterminate" (ngModelChange)="checkAll($event)"></label>
</th>
- <th nz-th><span>������</span></th>
+ <th nz-th><span>���������</span></th>
<th nz-th><span>������</span></th>
<th nz-th><span>������������</span></th>
<th nz-th><span>���������</span></th>
@@ -96,14 +96,14 @@
<td nz-td>{{alarmUser.email}}</td>
<td nz-td>{{alarmUser.weixin}}</td>
<!-- <td nz-td>{{alarmUser.password}}</td> -->
- <td nz-td>{{alarmUser.organizationId}}</td>
+ <td nz-td>{{alarmUser.organization?alarmUser.organization.name:alarmUser.organizationId}}</td>
<td nz-td>{{format_date(alarmUser.createTime)}}</td>
<td nz-td>{{format_date(alarmUser.expireTime)}}</td>
<td nz-td>
<a (click)="edit(alarmUser)">������</a>
<ng-container *ngIf="alarmUser.isDelete == '0'">
<span nz-table-divider></span>
- <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(alarmUser)" >
+ <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(alarmUser.id)" >
<a nz-popconfirm>������</a>
</nz-popconfirm>
</ng-container>
--
Gitblit v1.8.0