From 780f76a3e8dd68abe6b007006f85a76991ea2c54 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Apr 2018 13:40:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/systems/account/account.component.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
index 6dd2c18..a3e795f 100644
--- a/src/app/routes/systems/account/account.component.html
+++ b/src/app/routes/systems/account/account.component.html
@@ -135,16 +135,16 @@
</nz-table>
</nz-card>
<!-- ������������������ -->
-<nz-modal [nzVisible]="resetPwdWindowIsVisible" [nzTitle]="'������������'" [nzContent]="modalContent" (nzOnCancel)="resetPwdCancel($event)"
- (nzOnOk)="resetPwdOk($event)" [nzConfirmLoading]="isResetPwdLoading">
+<nz-modal [nzVisible]="resetPwdWindowIsVisible" [nzTitle]="'������������'" [nzContent]="modalContent" (nzOnCancel)="resetPwdCancel()"
+ (nzOnOk)="resetPwdOk()" [nzConfirmLoading]="isResetPwdLoading">
<ng-template #modalContent>
<form nz-form [formGroup]="resetPwdForm">
<div nz-form-item nz-row>
<div nz-form-label nz-col [nzSm]="6" [nzXs]="24">
<label for="accountName" >������</label>
</div>
- <div nz-form-control nz-col [nzSm]="14" [nzXs]="24" nzHasFeedback>
- <nz-input [nzSize]="'large'" nzReadonly="true" formControlName="accountName" [nzId]="'accountName'"></nz-input>
+ <div nz-form-control nz-col [nzSm]="14" [nzXs]="24">
+ <h4 class="h4">{{ getFormControl('accountName').value }}</h4>
</div>
</div>
<div nz-form-item nz-row>
--
Gitblit v1.8.0