From f5f0c39a77bb98e9a358065331ac8e4edeaaa7f8 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Mon, 1 Apr 2024 17:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/css/style.default.css    | 21 ++++++++++++++-----
 .../src/main/resources/templates/login.html   |  8 +++----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/style.default.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/style.default.css
index d3eee481..fcca65f4 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/style.default.css
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/style.default.css
@@ -1815,7 +1815,7 @@ input.input-material.is-invalid ~ label {
 
 .login-page .form-holder .info, .login-page .form-holder .form {
     min-height: 60vh;
-    padding: 40px;
+    padding: 5%;
     height: 100%
 }
 
@@ -1828,7 +1828,7 @@ input.input-material.is-invalid ~ label {
     background-color: rgba(38, 104, 254, .9);
     background-image: linear-gradient(transparent, rgba(17,32,57,.54));*/
     color: #fff;
-    background: url(../img/bg_cl.png) no-repeat center center;
+    background: url(../img/bg-loginleft.png) no-repeat center center;
     background-size: 100% auto;
 }
 
@@ -1843,7 +1843,6 @@ input.input-material.is-invalid ~ label {
     font-weight: normal;
     font-size: 1.5rem;
     top: 15%;
-    position: absolute;
     left: 0;
     color: #2668fe;
 }
@@ -1881,9 +1880,21 @@ input.input-material.is-invalid ~ label {
     max-width: 400px
 }
 
+.input-code {
+    float: left;
+    margin: 0 5% 0 0;
+    width: 20%;
+    height: 50px;
+}
+
+
 .login-page .form-holder .form #login, .login-page .form-holder .form #register {
-    margin-bottom: 20px;
-    cursor: pointer
+    /*margin-bottom: 20px;*/
+    /*cursor: pointer*/
+    float: right;
+    width: 30%;
+    height: 50px;
+    cursor: pointer;
 }
 
 .login-page .form-holder .form a.forgot-pass, .login-page .form-holder .form a.signup {
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html
index 58630d91..53065cf1 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html
@@ -58,16 +58,14 @@
                                 </div>
                                 <div class="form-group" th:if="${captchaEnabled==true}">
                                     <!--<div class="col-xs-6">-->
-                                        <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" autocomplete="off">
+                                        <input type="text" name="validateCode" class="form-control code input-code" placeholder="验证码" maxlength="5" autocomplete="off">
                                         <a href="javascript:void(0);" title="点击更换验证码">
                                             <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
                                         </a>
-                                    </div>
-                                    <div class="col-xs-6">
-
+                                        <button id="login" type="submit" class="btn btn-primary">登录</button>
                                     </div>
                                 </div>
-                                <button id="login" type="submit" class="btn btn-primary">登录</button>
+
                                 <div style="margin-top: -40px;">
 
                                     <!--<div class="custom-control custom-checkbox " style="float: right;">-->