diff --git 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 index 5208a56..55aecae 100644 --- 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") 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 473b7aa..f4793a2 100644 --- 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); diff --git a/ruoyi-admin/src/main/resources/static/img/login.jpg b/ruoyi-admin/src/main/resources/static/img/login.jpg index 160ac30..5732410 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/login.jpg and b/ruoyi-admin/src/main/resources/static/img/login.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/pay.png b/ruoyi-admin/src/main/resources/static/img/pay.png deleted file mode 100644 index bb8b967..0000000 Binary files a/ruoyi-admin/src/main/resources/static/img/pay.png and /dev/null differ diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index ab6b5f7..9856412 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -23,7 +23,7 @@
-
+

登录：

-

你若不离不弃，我必生死相依

+

后台管理系统

@@ -63,11 +63,11 @@
- + + + + +
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index f265b10..31d8c59 100644 --- 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 < 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 < = 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 )