Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Jinan_project

src/app/pages/login/login.component.html

@@ -1,9 +1,14 @@
 <div class="login" id="login">
+  <div class="left">
+    <p class="a1">Hi,欢迎登陆</p>
+    <p class="a2">防消一体化综合治理平台</p>
+  </div>
   <div class="card">
-    <h1 class="cardheader">欢迎登录</h1>
-    <h1 class="cardheader">济南管理系统</h1>
+    <!-- <h1 class="cardheader">登录</h1> -->
+    <!-- <h1 class="cardheader">济南管理系统</h1> -->
 
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
+      <nz-form-label>账号</nz-form-label>
       <nz-form-item>
         <nz-form-control nzErrorTip="请输入账号!">
           <nz-input-group nzPrefixIcon="user">
@@ -11,6 +16,7 @@
           </nz-input-group>
         </nz-form-control>
       </nz-form-item>
+      <nz-form-label>密码</nz-form-label>
       <nz-form-item>
         <nz-form-control nzErrorTip="请输入密码!">
           <nz-input-group nzPrefixIcon="lock">
@@ -22,21 +28,21 @@
       <div class="hint">
         <nz-form-item style="margin-bottom: 0;">
           <nz-form-control>
-            <label nz-checkbox formControlName="remember" [(ngModel)]="remember">记住密码</label>
+            <label nz-checkbox formControlName="remember" [(ngModel)]="remember">七天内自动登陆</label>
           </nz-form-control>
         </nz-form-item>
         <span class="forget" (click)="forget()">忘记密码?</span>
       </div>
-      <nz-form-item style="margin-bottom: 0;">
+      <!-- <nz-form-item style="margin-bottom: 0;">
         <nz-form-control>
           <label class="autologin" formControlName="autologin" nz-checkbox [(ngModel)]="autologin">自动登录</label>
         </nz-form-control>
-      </nz-form-item>
+      </nz-form-item> -->
 
       <button [nzLoading]="isLoading" nz-button class="login-form-button login-form-margin"
         [nzType]="'primary'">登录</button>
     </form>
-    <p class="company">北京安信科创软件有限公司 版权所有</p>
+    <p class="company">防消一体化综合治理平台 v1.1.0</p>
   </div>
 
 

src/app/pages/login/login.component.scss

@@ -3,33 +3,42 @@
   height: 100%;
   background: url('../../../assets/images/bgImg.png');
   background-size: 100% 100%;
-  position: relative;
+  
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.left{
+  color: #feffff;
+  margin-right: 100px;
+  p{
+    font-size: 24px;
+    text-align: left;
+  }
+  .a2{
+    font-size: 44px;
+  }
 }
-
 .card {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%,-50%);
-  background-color: rgba(0, 13, 33, 0.24);
-  border-radius: 16px;
+  background-color: #fff;
+  border-radius: 4px;
   width: 468px;
-  height: 548px;
+  height: 504px;
   box-sizing: border-box;
   padding: 79px 45px 42px 45px;
-  color: rgba(255, 255, 255, 1);
+  color: #3b3b3b;
 }
 
 .cardheader {
   font-size: 22px;
-  color: rgba(255, 255, 255, 1);
+  color: #3b3b3b
 }
 .cardheader:nth-child(2) {
   margin-bottom: 40px;
 }
 
 label {
-  color: #fff;
+  color: #3b3b3b;
 }
 
 .hint {
@@ -48,9 +57,11 @@ label {
 }
 
 button {
+  margin: 40px 0;
   width: 100%;
   height: 42px;
   font-size: 16px;
+  background: #2D4CC1;
   border-radius: 4px;
 }
 
@@ -83,7 +94,7 @@ p {
 
   h1 {
     font-size: 63px;
-    color: #feffff;
+    color: #3b3b3b;
     font-weight: 600;
 
     text-shadow: 0px 2px 8px #2399FF;

src/styles.scss

@@ -102,7 +102,7 @@ app-root {
 
 .blue {
   cursor: pointer;
-  color: #1890ff;
+  color: #2D4CC1;
 }
 
 .red {