修改总装

4 years ago · 8718cdf026
parent ed9a83cffa
commit 8718cdf026
6 changed files with 25 additions and 24 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@ -49,7 +49,7 @@ public class SysLoginController extends BaseController
        mmap.put("isRemembered", rememberMe);
        // 是否开启用户注册
        mmap.put("isAllowRegister", Convert.toBool(configService.getKey("sys.account.registerUser"), false));
-        return "login_v1";
+        return "login";
    }

    @PostMapping("/login")
--- a/ruoyi-admin/src/main/resources/static/css/login.min.css
+++ b/ruoyi-admin/src/main/resources/static/css/login.min.css
@ -35,8 +35,8 @@ html {

 body.signin {
    height: auto;
-    /*background: url(../img/login-background.jpg) no-repeat center fixed;*/
    background: url(../img/login.jpg) no-repeat center fixed;
+    /*background: url(../img/login.jpg) no-repeat center fixed;*/
    -webkit-background-size: cover;
    -moz-background-size: cover;
    -o-background-size: cover;
@ -96,17 +96,17 @@ body.signin {
    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*/
-/*}*/
+.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 {
    border-top: solid 1px rgba(255, 255, 255, .3);
--- a/ruoyi-admin/src/main/resources/static/img/login.jpg
+++ b/ruoyi-admin/src/main/resources/static/img/login.jpg
--- a/ruoyi-admin/src/main/resources/static/img/pay.png
+++ b/ruoyi-admin/src/main/resources/static/img/pay.png
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@ -23,7 +23,7 @@
 <body class="signin">
    <div class="signinpanel">
        <div class="row">
-            <div class="col-sm-7">
+       <!--     <div class="col-sm-7">
                <div class="signin-info">
                    <div class="logopanel m-b">
                        <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
@ -39,11 +39,11 @@
                    </ul>
                    <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
                </div>
-            </div>
+            </div>-->
            <div class="col-sm-5">
                <form id="signupForm" autocomplete="off">
                    <h4 class="no-margins">登录：</h4>
-                    <p class="m-t-md">你若不离不弃，我必生死相依</p>
+                    <p class="m-t-md">后台管理系统</p>
                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
@ -63,11 +63,11 @@
                </form>
            </div>
        </div>
-        <div class="signup-footer">
-            <div class="pull-left">
-                Copyright © 2018-2022 ruoyi.vip All Rights Reserved. <br>
-            </div>
-        </div>
+<!--        <div class="signup-footer">-->
+<!--            <div class="pull-left">-->
+<!--                Copyright © 2018-2022  <br>-->
+<!--            </div>-->
+<!--        </div>-->
    </div>
 <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
 <!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@ -606,8 +606,6 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number,

 where 0 &lt; ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM
  and ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM &lt; = 180
-
-
 union
 select count(1) as qty,
       3        as name
@ -1074,7 +1072,10 @@ where DETIAL_TYPE_CODE = '1004'
                        SUM(H_Unqualified_Qty) H_Unqualified_Qty

                 from view_imos_pr_barcode sqlwhere
-                 where TO_CHAR(SCAN_TIME, 'yyyy-MM-dd') = TO_CHAR(sysdate, 'yyyy-MM-dd')
+                 where SCAN_TIME between
+                      to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+                     and
+                      to_date(to_char(SYSDATE+1, 'yyyy-MM-dd') || '00:59:00', 'yyyy-MM-dd hh24:mi:ss')
                   and ITEM_CODE in ('1001', '1002', '1003', '1005', '1006')
                 group by ITEM_CODE
             )