diff --git a/ruoyi-admin/src/main/resources/static/css/login.css b/ruoyi-admin/src/main/resources/static/css/login.css
index 63a9b01..66c4f6c 100644
--- a/ruoyi-admin/src/main/resources/static/css/login.css
+++ b/ruoyi-admin/src/main/resources/static/css/login.css
@@ -3,7 +3,7 @@ html {
}
body.signin {
height:auto;
- background:url(../img/login-background.jpg) no-repeat center fixed;
+ background:url(../img/login-background2.jpg) no-repeat center fixed;
-webkit-background-size:cover;
-moz-background-size:cover;
-o-background-size:cover;
@@ -158,4 +158,4 @@ body.signin {
.form-control:focus{
border-color: #1ab394 !important;
-}
\ No newline at end of file
+}
diff --git a/ruoyi-admin/src/main/resources/static/css/login.min.css b/ruoyi-admin/src/main/resources/static/css/login.min.css
index 8467e58..f1ae06d 100644
--- a/ruoyi-admin/src/main/resources/static/css/login.min.css
+++ b/ruoyi-admin/src/main/resources/static/css/login.min.css
@@ -1 +1 @@
-html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.signinpanel{width:750px;margin:15% auto 0;color:rgba(255,255,255,.95)}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:380px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}
+html{height:100%}body.signin{height:auto;background:url(../img/login-background2.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.signinpanel{width:750px;margin:15% auto 0;color:rgba(255,255,255,.95)}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:380px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}
diff --git a/ruoyi-admin/src/main/resources/static/img/login-background2.jpg b/ruoyi-admin/src/main/resources/static/img/login-background2.jpg
new file mode 100644
index 0000000..5367366
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/login-background2.jpg differ
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 71fb47a..13decc9 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -18,7 +18,7 @@
<link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
<style type="text/css">label.error { position:inherit; }
.verifybox {
- left: 63%;
+ left: 50%;
top: 45%;
transform: translate(-52%, -50%);
}
@@ -32,48 +32,56 @@
left: 50px;
top: 6px;
}
+ .signinpanel{
+ width: 544px;
+ margin: 0;
+ color: rgba(49, 49, 49, 0.95);
+ height: 506px;
+ background: white;
+ position: absolute;
+ top: 25%;
+ left: 34%;
+ border-radius: 20px;
+ box-shadow: 5px 5px 10px 2px rgba(0, 0, 0, 0.3);
+ }
+ input{
+ margin-bottom: 30px;
+ }
+ #signupForm{
+ background: none;
+ border: none;
+ box-shadow: none;
+ }
</style>
<script>
if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
</script>
</head>
<body class="signin">
-<div class="top">
- <img th:src='@{../img/top.png}' style="width: 100%;height: 100%;position: absolute" alt="">
- <span class="mi">
- <img th:src='@{../img/mi.png}' alt="">
- </span>
-</div>
<div id="verfyImg">
</div>
- <div class="signinpanel">
- <div class="row">
- <div class="col-sm-7">
- <div class="signin-info">
- <div class="logopanel m-b">
- </div>
- <div class="m-b"></div>
- <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册»</a></strong>
- </div>
- </div>
- <div class="col-sm-5">
- <form id="signupForm" autocomplete="off">
- <h3 style="text-align: center;"><strong>保密业务综合管理系统</strong></h3>
- <input type="text" name="username" class="form-control uname" placeholder="用户名" value="" />
- <input type="password" name="password" class="form-control pword" placeholder="密码" value="" />
- <div class="checkbox-custom m-t" th:if="${isRemembered}">
- <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
- </div>
- <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
- </form>
- </div>
+<div class="signinpanel">
+ <form id="signupForm" autocomplete="off" style="height: 88%;border-radius: 20px">
+ <h2 style="text-align: center;margin-bottom: 30px"><strong>保密业务综合管理系统</strong></h2>
+ <input type="text" name="username" class="form-control uname" placeholder="用户名" value="" />
+ <input type="password" name="password" class="form-control pword" placeholder="密码" value="" />
+ <div class="checkbox-custom m-t" th:if="${isRemembered}">
+ <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
</div>
- <div class="signup-footer">
- <div class="pull-right">
- Copyright © 2018-2024 ZHKY All Rights Reserved. <br>
- </div>
+ <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
+ </form>
+ <div class="signup-footer">
+ <div class="pull-right">
+ Copyright © 2018-2024 ZHKY All Rights Reserved. <br>
</div>
</div>
+</div>
+<!--<div class="top">-->
+<!-- <img th:src='@{../img/top.png}' style="width: 100%;height: 100%;position: absolute" alt="">-->
+<!-- <span class="mi">-->
+<!-- <img th:src='@{../img/mi.png}' alt="">-->
+<!-- </span>-->
+<!--</div>-->
<script th:inline="javascript"> var ctx = [[@{/}]];</script>
<!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
<!-- 全局js -->