提交修改

9 months ago · 463f412c75
parent 8ef135d20f
commit 463f412c75
3 changed files with 89 additions and 3 deletions
--- a/ruoyi-admin/src/main/resources/static/html/ie.html
+++ b/ruoyi-admin/src/main/resources/static/html/ie.html
@ -10,7 +10,7 @@
    <style type="text/css">
        html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;font-size:100%;font:inherit;vertical-align:baseline;margin:0;padding:0}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:none}table{border-collapse:collapse;border-spacing:0}
        a{text-decoration:none;color:#0072c6;}a:hover{text-decoration:none;color:#004d8c;}
-        body{width:960px;margin:0 auto;padding:10px;font-size:14px;line-height:24px;color:#454545;font-family:'Microsoft YaHei UI','Microsoft YaHei',DengXian,SimSun,'Segoe UI',Tahoma,Helvetica,sans-serif;overflow-y:scroll}
+        body{width:960px;margin:0 auto;padding:10px;font-size:15px;line-height:24px;color:#454545;font-family:'Microsoft YaHei UI','Microsoft YaHei',DengXian,SimSun,'Segoe UI',Tahoma,Helvetica,sans-serif;overflow-y:scroll}
        h1{font-size:40px;line-height:80px;font-weight:100;margin-bottom:10px;}
        h2{font-size:20px;line-height:25px;font-weight:100;margin:10px 0;}
        em{color:red}
--- a/ruoyi-admin/src/main/resources/templates/home/base.html
+++ b/ruoyi-admin/src/main/resources/templates/home/base.html
@ -570,6 +570,50 @@
            height: 30px !important;
            vertical-align: -7px !important;
        }
+
+        #ad {
+            font-weight: bold;
+            position: fixed;
+            display: flex;
+            width: 250px;
+            justify-content: center;
+            align-items: center;
+            z-index: 9999;
+        }
+        #ad span{
+            position: absolute;
+            bottom: 0;
+            right: 0;
+            width: 32px;
+            color: white;
+            cursor:pointer;
+        }
+        #ad {
+            -webkit-animation: rotate 5s linear infinite;
+            -moz-animation: rotate 5s linear infinite;
+            -o-animation: rotate 5s linear infinite;
+            animation: rotate 5s linear infinite;
+        }
+
+        /*@keyframes rotate*/
+        /*{*/
+        /*    0%*/
+        /*    {*/
+        /*        -webkit-transform: rotate(0deg);*/
+        /*        -moz-transform: rotate(0deg);*/
+        /*        -ms-transform: rotate(0deg);*/
+        /*        -o-transform: rotate(0deg);*/
+        /*        transform: rotate(0deg);*/
+        /*    }*/
+        /*    100%*/
+        /*    {*/
+        /*        -webkit-transform: rotate(360deg);*/
+        /*        -moz-transform: rotate(360deg);*/
+        /*        -ms-transform: rotate(360deg);*/
+        /*        -o-transform: rotate(360deg);*/
+        /*        transform: rotate(360deg);*/
+        /*    }*/
+        /*}*/
 </style>
 </head>
 <body class="layui-bg-gray" style="">
@ -579,6 +623,12 @@
    <div id="back-to-top" onclick="scrollToTop()">
        <img th:src="@{/home/base/fanhui.png}">
    </div>
+    <div id="ad">
+        <a th:href="@{/special_view.html(columnId=${specialColumns[0].columnId})}" th:title="${specialColumns[0].columnName}" target="_blank">
+            <img style="width: 100% "  th:src="${specialColumns[0].columnUrl}">
+        </a>
+        <a onclick="closeAd()"><span>关闭</span></a>
+    </div>
    <div class="layui-container">
        <div class="notice">
            <div class="notice__inner">
@ -1042,6 +1092,42 @@
    $('.myscroll').myScroll({
        speed: 30,
    });
+
+    let el = document.querySelector('#ad');
+    let styleTop = 0;
+    let styleLeft = 0;
+    let verticalFlag = true;
+    let horizontalFlag = true;
+    let isMouseOver = false; // 新变量用于跟踪鼠标是否在元素上
+
+    // 设置定时器的函数
+    function moveElement() {
+        if (!isMouseOver) { // 如果鼠标不在元素上，则继续移动
+            verticalFlag ? styleTop++ : styleTop--;
+            horizontalFlag ? styleLeft++ : styleLeft--;
+
+            (styleTop <= 0 || styleTop >= window.innerHeight - el.offsetHeight) && (verticalFlag = !verticalFlag);
+            (styleLeft <= 0 || styleLeft >= window.innerWidth - el.offsetWidth) && (horizontalFlag = !horizontalFlag);
+
+            el.style.top = `${styleTop}px`;
+            el.style.left = `${styleLeft}px`;
+        }
+    }
+
+    setInterval(moveElement, 20);
+
+    // 添加事件监听器以检测鼠标是否在元素上
+    el.addEventListener('mouseover', () => {
+        isMouseOver = true;
+    });
+
+    el.addEventListener('mouseout', () => {
+        isMouseOver = false;
+    });
+    function closeAd(){
+        isMouseOver = true;
+        el.style.display = 'none'
+    }
 </script>
 </body>
 </html>
--- a/ruoyi-admin/src/main/resources/templates/home_footer.html
+++ b/ruoyi-admin/src/main/resources/templates/home_footer.html
@ -5,7 +5,7 @@
                background-color: #074488;
                color: #fff;
                margin-top: 20px;
-                width: 100%;
+                min-width: 1690px;
                display: flex;
                justify-content: center;
            }