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 |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/passport/login/login.component.html b/src/app/routes/passport/login/login.component.html
index a0e1b2f..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>
@@ -15,7 +15,7 @@
     </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>

--
Gitblit v1.8.0