Merge remote-tracking branch 'origin/kingbase' into kingbase

10 months ago · 67900670d9
parent b04c5d3c5a 1815c24122
commit 67900670d9
7 changed files with 20 additions and 1 deletions
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/element.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/element.css
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/fonts/element-icons.ttf
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/fonts/element-icons.ttf
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/fonts/element-icons.woff
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/fonts/element-icons.woff
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/element.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/element.js
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@ -42,6 +42,14 @@
 	<script th:src="@{/ruoyi/js/getCity.js?v=4.7.7}"></script>
 </div>

+<!-- element下拉框插件 -->
+<div th:fragment="element-css">
+	<link th:href="@{/ruoyi/css/element.css?v=0.0.0}" rel="stylesheet"/>
+</div>
+<div th:fragment="element-js">
+	<script th:src="@{/ruoyi/js/element.js?v=0.0.0}"></script>
+</div>
+
 <!-- ztree树插件 -->
 <div th:fragment="ztree-css">
    <link th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
--- a/ruoyi-admin/src/main/resources/templates/system/exam/exam.html
+++ b/ruoyi-admin/src/main/resources/templates/system/exam/exam.html
@ -964,10 +964,17 @@
                window.location.href = `/system/exam`;
            }
        };
+        window.addEventListener('beforeunload', function() {
+            documentVisililityChange();
+        });
+
+        window.addEventListener('unload', function() {
+            documentVisililityChange();
+        });
        document.addEventListener('visibilitychange',documentVisililityChange)
        function documentVisililityChange (){
-            alert("检测到您已切换页面，系统将进行强制提交");
                if (document.visibilityState === 'hidden'){
+                    alert("检测到您已切换页面，系统将进行强制提交");
                    submitMethid();
                }
        }
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
    <th:block th:include="include :: header('文件下发列表')" />
+    <th:block th:include="include :: element-css" />
 </head>
 <body class="gray-bg">
     <div class="container-div" id="app">
@ -57,6 +58,7 @@
        </div>
    </div>
    <th:block th:include="include :: footer" />
+     <th:block th:include="include :: element-js" />
    <script th:inline="javascript">
        var removeFlag = [[${@permission.hasPermi('system:fileprovide:remove')}]];
        var detailFlag = [[${@permission.hasPermi('system:fileprovide:detail')}]];