From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/devices/basic-info/basic-info.component.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/devices/basic-info/basic-info.component.html b/src/app/routes/devices/basic-info/basic-info.component.html
index 3b0a7bb..bf288eb 100644
--- a/src/app/routes/devices/basic-info/basic-info.component.html
+++ b/src/app/routes/devices/basic-info/basic-info.component.html
@@ -1,12 +1,12 @@
<div class="content__title">
<h1>
- ������������
+ ������������
<small>���������������������������������������������������������</small>
</h1>
</div>
<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="selectedRows.length > 0">
@@ -24,4 +24,4 @@
</div>
<simple-table #simpleTable [data]="listUrl" [extraParams]="extraParams" [columns]="columns" [showTotal]="true"
[reqReName]="{pi: 'pageIndex',ps: 'pageSize'}" (checkboxChange)="checkboxChange($event)" [ps]="10" [resReName]="{list: 'data',total: 'total'}"></simple-table>
-</nz-card>
\ No newline at end of file
+</nz-card>
--
Gitblit v1.8.0