From 7ca521e4267b987270f6ccbb9a6c076aeb467d96 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:11:33 +0800
Subject: [PATCH] 设备，监控站 管理功能增强
---
src/app/routes/passport/login/login.component.html | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/app/routes/passport/login/login.component.html b/src/app/routes/passport/login/login.component.html
index 1b6d4aa..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,18 +10,20 @@
<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>
</nz-input>
<div nz-form-explain *ngIf="(password.dirty || password.touched) && password.errors?.required">������������������</div>
- <p nz-form-explain [ngStyle]="{'color': 'red'}" *ngIf="validateError">������������������������������������</p>
+ <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>
@@ -31,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,16 +42,3 @@
</button>
</div>
</form>
-<div class="other">
- ������������������
- <nz-tooltip [nzTitle]="'in fact Auth0 via window'">
- <span nz-tooltip class="icon-alipay" (click)="open('auth0', 'window')"></span>
- </nz-tooltip>
- <nz-tooltip [nzTitle]="'in fact Github via redirect'">
- <span nz-tooltip class="icon-taobao" (click)="open('github')"></span>
- </nz-tooltip>
- <nz-tooltip [nzTitle]="'���������������'">
- <span nz-tooltip class="icon-weibo" (click)="open('weibo', 'window')"></span>
- </nz-tooltip>
- <a class="register" routerLink="/passport/register">������������</a>
-</div>
--
Gitblit v1.8.0