From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/passport/login/login.component.html | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/passport/login/login.component.html b/src/app/routes/passport/login/login.component.html
index 9b86a36..5e7e684 100644
--- a/src/app/routes/passport/login/login.component.html
+++ b/src/app/routes/passport/login/login.component.html
@@ -2,7 +2,7 @@
<nz-alert *ngIf="error" [nzType]="'error'" [nzMessage]="error" [nzShowIcon]="true" class="mb-lg"></nz-alert>
<div nz-form-item>
<div nz-form-control [nzValidateStatus]="userName">
- <nz-input formControlName="userName" [nzPlaceHolder]="'admin'" [nzSize]="'large'">
+ <nz-input formControlName="userName" [nzSize]="'large'">
<ng-template #prefix>
<i class="anticon anticon-user"></i>
</ng-template>
@@ -10,12 +10,12 @@
<ng-container *ngIf="userName.dirty || userName.touched">
<p nz-form-explain *ngIf="userName.errors?.required">���������������������</p>
<p nz-form-explain *ngIf="userName.errors?.minlength">������������������</p>
- </ng-container>
+ </ng-container>
</div>
</div>
<div nz-form-item>
<div nz-form-control [nzValidateStatus]="password">
- <nz-input formControlName="password" [nzPlaceHolder]="'888888'" [nzType]="'password'" [nzSize]="'large'">
+ <nz-input formControlName="password" [nzType]="'password'" [nzSize]="'large'">
<ng-template #prefix>
<i class="anticon anticon-lock"></i>
</ng-template>
@@ -23,6 +23,7 @@
<div nz-form-explain *ngIf="(password.dirty || password.touched) && password.errors?.required">������������������</div>
<p nz-form-explain [ngStyle]="{'color': 'red'}" *ngIf="validateError.password_incorrect">������������������������������������</p>
<p nz-form-explain [ngStyle]="{'color': 'red'}" *ngIf="validateError.account_expired">������������������������������������������</p>
+ <p nz-form-explain [ngStyle]="{'color': 'red'}" *ngIf="validateError.server_offline">������������������������������</p>
</div>
</div>
<div nz-form-item nz-row>
@@ -32,7 +33,7 @@
</label>
</div>
<div nz-col [nzSpan]="12" class="text-right">
- <a class="forgot" (click)="msg.error('���������������')">���������������</a>
+ <a class="forgot" (click)="msg.error('������������������������')">���������������</a>
</div>
</div>
<div nz-form-item>
@@ -40,4 +41,4 @@
<span>������</span>
</button>
</div>
-</form>
\ No newline at end of file
+</form>
--
Gitblit v1.8.0