修改样式问题

ruoyi-admin/src/main/resources/static/style/base.css

@@ -147,6 +147,7 @@
   padding: 25px;
   font-size: 16px;
   height: 68vh;
+  overflow-y: scroll;
 }
 .height-74 {
   height: 74vh !important;

ruoyi-admin/src/main/resources/templates/InteractiveColumns.html

@@ -42,7 +42,9 @@
                                 <li th:each="item,itemStat : ${dataSourceOne}">
                                     <div class="w20 flex-row ph-title-gx" style="padding-left: 0;">
                                         <div class="ph-img-bg" th:text="${itemStat.count}"><h3></h3></div>
-                                        <div class="title" th:text="${item.deptName}"></div>
+                                        <div class="title" th:attr="title=${item.deptName}" th:text="${#strings.length(item.deptName) > 20}
+                  ? ${#strings.substring(item.deptName, 0, 20) + '...'}
+                  : ${item.deptName}"></div>
                                     </div>
                                     <div class="w30">
                                         <span>
@@ -73,7 +75,9 @@
                                 <li th:each="item,itemStat : ${dataSourceTwo}">
                                     <div class="w20 flex-row ph-title-gx" style="padding-left: 0;">
                                         <div class="ph-img-bg" th:text="${itemStat.count}"><h3></h3></div>
-                                        <div class="title" th:text="${item.areaName}"></div>
+                                        <div class="title" th:attr="title=${item.areaName}" th:text="${#strings.length(item.areaName) > 20}
+                  ? ${#strings.substring(item.areaName, 0, 20) + '...'}
+                  : ${item.areaName}"></div>
                                     </div>
                                     <div class="w30">
                                         <span>
@@ -104,7 +108,9 @@
                                 <li th:each="item,itemStat : ${dataSourceThree}">
                                     <div class="w20 flex-row ph-title-gx" style="padding-left: 0;">
                                         <div class="ph-img-bg" th:text="${itemStat.count}"><h3></h3></div>
-                                        <div class="title" th:text="${item.countyName}"></div>
+                                        <div class="title" th:attr="title=${item.countyName}" th:text="${#strings.length(item.countyName) > 20}
+                  ? ${#strings.substring(item.countyName, 0, 20) + '...'}
+                  : ${item.countyName}"></div>
                                     </div>
                                     <div class="w30">
                                         <span>

ruoyi-admin/src/main/resources/templates/censusIndicators.html

@@ -36,7 +36,9 @@
                 <div class="content-list-body height-28" style="width: auto;  overflow-y: auto; padding-top: 0">
                     <ul id="messageUlOne" >
                         <li th:each="item : ${dataSourceOne}">
-                            <div class="w50"><span th:text="${item.siteName}"></span></div>
+                            <div class="w50"><span th:attr="title=${item.siteName}" th:text="${#strings.length(item.siteName) > 20}
+                  ? ${#strings.substring(item.siteName, 0, 20) + '...'}
+                  : ${item.siteName}"></span></div>
                             <div class="w15">
                                 <span th:if="${item.result == '1'}">
                                     <img th:src="@{img/yes-img.png}" alt=""/>
@@ -46,7 +48,9 @@
                                 </span>
                             </div>
                             <div class="w15"><span th:text="${item.censusTime}"></span></div>
-                            <div class="w15"><span th:text="${item.remark}"></span></div>
+                            <div class="w15"><span th:attr="title=${item.remark}" th:text="${#strings.length(item.remark) > 20}
+                  ? ${#strings.substring(item.remark, 0, 20) + '...'}
+                  : ${item.remark}"></span></div>
                             <img class="table-triangle-top" th:src="@{img/triangle.png}"/>
                             <img class="table-triangle-btm" th:src="@{img/triangle.png}"/>
                         </li>
@@ -75,7 +79,9 @@
                 <div class="content-list-body height-28" style="width: auto;  overflow-y: auto;padding-top: 0">
                     <ul id="messageUlTwo" >
                         <li th:each="item : ${dataSourceTwo}">
-                            <div class="w20"><span th:text="${item.siteName}"></span></div>
+                            <div class="w20"><span th:attr="title=${item.siteName}" th:text="${#strings.length(item.siteName) > 20}
+                  ? ${#strings.substring(item.siteName, 0, 20) + '...'}
+                  : ${item.siteName}"></span></div>
                             <div class="w10 j-left"><span th:text="${item.siteUrl}"></span></div>
                             <div class="w10"><span th:text="${item.homepageType}"></span></div>
                             <div class="w10"><span th:text="${item.trends}"></span></div>

ruoyi-admin/src/main/resources/templates/dailyUpdateVolume.html

@@ -34,7 +34,9 @@
                             <ul class="infoList" id="messageUlOne">
                                 <li th:each="item : ${dataSourceOne}">
                                     <div class="paihang" th:text="${item.ranking}"></div>
-                                    <div class="gov-name" th:text="${item.renewName}"></div>
+                                    <div class="gov-name" th:attr="title=${item.renewName}" th:text="${#strings.length(item.renewName) > 20}
+                  ? ${#strings.substring(item.renewName, 0, 20) + '...'}
+                  : ${item.renewName}"></div>
                                     <div class="click-num" th:text="${item.renewCount}"><span
                                             class="font-small-size">条</span></div>
                                 </li>
@@ -46,7 +48,9 @@
                             <ul class="infoList" id="messageUlTwo">
                                 <li th:each="item : ${dataSourceTwo}">
                                     <div class="paihang" th:text="${item.ranking}"></div>
-                                    <div class="gov-name" th:text="${item.renewName}"></div>
+                                    <div class="gov-name" th:attr="title=${item.renewName}" th:text="${#strings.length(item.renewName) > 20}
+                  ? ${#strings.substring(item.renewName, 0, 20) + '...'}
+                  : ${item.renewName}"></div>
                                     <div class="click-num" th:text="${item.renewCount}"><span
                                             class="font-small-size">条</span></div>
                                 </li>

ruoyi-admin/src/main/resources/templates/dailyVisits.html

@@ -34,7 +34,9 @@
                             <ul id="messageUlOne" class="infoList">
                                 <li th:each="item : ${dataSourceOne}">
                                     <div class="paihang" th:text="${item.ranking}"></div>
-                                    <div class="gov-name" th:text="${item.accessName}"></div>
+                                    <div class="gov-name" th:attr="title=${item.accessName}" th:text="${#strings.length(item.accessName) > 20}
+                  ? ${#strings.substring(item.accessName, 0, 20) + '...'}
+                  : ${item.accessName}"></div>
                                     <div class="click-num" th:text="${item.browseCount}"></div>
                                 </li>
                             </ul>
@@ -44,9 +46,11 @@
                         <div class="bd">
                             <ul id="messageUlTwo" class="infoList">
                                 <li th:each="item : ${dataSourceTwo}">
-                                    <div class="paihang" th:text="${item.ranking}">1</div>
-                                    <div class="gov-name" th:text="${item.accessName}">蛟河市人民政府</div>
-                                    <div class="click-num" th:text="${item.browseCount}">76542</div>
+                                    <div class="paihang" th:text="${item.ranking}"></div>
+                                    <div class="gov-name" th:attr="title=${item.accessName}" th:text="${#strings.length(item.accessName) > 20}
+                  ? ${#strings.substring(item.accessName, 0, 20) + '...'}
+                  : ${item.accessName}"></div>
+                                    <div class="click-num" th:text="${item.browseCount}"></div>
                                 </li>
                             </ul>
                         </div>

ruoyi-admin/src/main/resources/templates/misunderstanding.html

@@ -30,7 +30,9 @@
                     <div class="w25"><h5>错别字数量</h5></div>
                   </li>
                     <li th:each="item : ${dataSource}">
-                        <div class="w50"><span th:text="${item.misprintName}"></span></div>
+                        <div class="w50"><span th:attr="title=${item.misprintName}" th:text="${#strings.length(item.misprintName) > 20}
+                  ? ${#strings.substring(item.misprintName, 0, 20) + '...'}
+                  : ${item.misprintName}"></span></div>
                         <div class="w25"><span th:text="${item.misprintCount}"></span></div>
                         <img class="table-triangle-top" th:src="@{img/triangle.png}">
                         <img class="table-triangle-btm" th:src="@{img/triangle.png}">
@@ -47,7 +49,9 @@
                     <div class="w25"><h5>错别字数量</h5></div>
                   </li>
                     <li th:each="item : ${dataAccess}">
-                        <div class="w50"><span th:text="${item.misprintName}"></span></div>
+                        <div class="w50"><span th:attr="title=${item.misprintName}" th:text="${#strings.length(item.misprintName) > 20}
+                  ? ${#strings.substring(item.misprintName, 0, 20) + '...'}
+                  : ${item.misprintName}"></span></div>
                         <div class="w25"><span th:text="${item.misprintCount}"></span></div>
                     <img class="table-triangle-top" th:src="@{img/triangle.png}">
                     <img class="table-triangle-btm" th:src="@{img/triangle.png}">

ruoyi-admin/src/main/resources/templates/staggeredChain.html

@@ -30,7 +30,9 @@
                             <div class="w15"><h5>商业赌博网站链接数量</h5></div>
                         </li>
                         <li th:each="item : ${dataSource}" >
-                            <div class="w50"><span th:text="${item.siteName}"></span></div>
+                            <div class="w50"><span th:attr="title=${item.siteName}" th:text="${#strings.length(item.siteName) > 20}
+                  ? ${#strings.substring(item.siteName, 0, 20) + '...'}
+                  : ${item.siteName}"></span></div>
                             <div class="w15"><span th:text="${item.errorCount}"></span></div>
                             <div class="w15"><span th:text="${item.maliciousCount}"></span></div>
                             <div class="w15"><span th:text="${item.gambleCount}"></span></div>

ruoyi-admin/src/main/resources/templates/usability.html

@@ -6,124 +6,133 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>吉林市政府网站可用性实时监测</title>
     <link rel="shortcut icon" th:href="@{favicon.ico}">
-    <link rel="stylesheet" type="text/css" th:href="@{/style/html.css}" />
-    <link rel="stylesheet" type="text/css" th:href="@{/style/base.css}" />
+    <link rel="stylesheet" type="text/css" th:href="@{/style/html.css}"/>
+    <link rel="stylesheet" type="text/css" th:href="@{/style/base.css}"/>
 </head>
 <body class="black-bg">
-    <!-- 头部 Start -->
-    <div class="header flex-row  flex-y-center">
-        <h1>吉林市政府网站可用性实时监测</h1>
+<!-- 头部 Start -->
+<div class="header flex-row  flex-y-center">
+    <h1>吉林市政府网站可用性实时监测</h1>
+</div>
+<!-- 头部 End -->
+<!-- 内容 Start -->
+<div class="container">
+    <!-- 上方总数 Start -->
+    <div class="row-top flex-row flex-y-center">
+        <!--          <div class="row-top-list flex-row flex-x-center">-->
+        <!--            <span>网站总数</span>-->
+        <!--            <span>25</span>-->
+        <!--          </div>-->
+        <!--          <div class="row-top-list flex-row flex-x-center">-->
+        <!--            <span>正常</span>-->
+        <!--            <span>25</span>-->
+        <!--          </div>-->
+        <!--          <div class="row-top-list flex-row flex-x-center">-->
+        <!--            <span>故障</span>-->
+        <!--            <span>25</span>-->
+        <!--          </div>-->
     </div>
-    <!-- 头部 End -->
-    <!-- 内容 Start -->
-    <div class="container">
-       <!-- 上方总数 Start -->
-       <div class="row-top flex-row flex-y-center">
-<!--          <div class="row-top-list flex-row flex-x-center">-->
-<!--            <span>网站总数</span>-->
-<!--            <span>25</span>-->
-<!--          </div>-->
-<!--          <div class="row-top-list flex-row flex-x-center">-->
-<!--            <span>正常</span>-->
-<!--            <span>25</span>-->
-<!--          </div>-->
-<!--          <div class="row-top-list flex-row flex-x-center">-->
-<!--            <span>故障</span>-->
-<!--            <span>25</span>-->
-<!--          </div>-->
-       </div>
-       <!-- 上方总数 End -->
+    <!-- 上方总数 End -->
 
-       <!-- 正文 Start -->
-       <div class="content">
-          <img class="x-line" th:src="@{img/bg-line.png}" alt="">
-          <div class="content-list flex-row">
+    <!-- 正文 Start -->
+    <div class="content">
+        <img class="x-line" th:src="@{img/bg-line.png}" alt="">
+        <div class="content-list flex-row">
             <div class="content-list-left flex-col">
-              <h4>可用性实时监测情况</h4>
-              <div class="content-list-body">
-                <ul id="messageUlOne">
-                  <li class="content-list-body-tit">
-                    <div class="w50"><h5>站点名称</h5></div>
-                    <div class="w25"><h5>监测时间</h5></div>
-                    <div class="w25"><h5>网站状态</h5></div>
-                  </li>
-                  <li th:each="item : ${dataSourceOne}">
-                      <div class="w50"><span class="h-span" th:text="${item.siteName}"></span></div>
-                      <div class="w25"><span class="h-span" th:text="${item.monitorTime}"></span></div>
-                      <div class="w25"><span class="h-span" th:text="${item.status}"></span></div>
-                      <img class="table-triangle-top" th:src="@{img/triangle.png}">
-                      <img class="table-triangle-btm" th:src="@{img/triangle.png}">
-                  </li>
-                </ul>
-              </div>
+                <h4>可用性实时监测情况</h4>
+                <div class="content-list-body">
+                    <ul id="messageUlOne">
+                        <li class="content-list-body-tit">
+                            <div class="w50"><h5>站点名称</h5></div>
+                            <div class="w25"><h5>监测时间</h5></div>
+                            <div class="w25"><h5>网站状态</h5></div>
+                        </li>
+                        <li th:each="item : ${dataSourceOne}">
+                            <div class="w50">
+                          <span class="h-span"
+                                th:attr="title=${item.siteName}"
+                                th:text="${#strings.length(item.siteName) > 20}
+                  ? ${#strings.substring(item.siteName, 0, 20) + '...'}
+                  : ${item.siteName}">
+                      </span>
+                            </div>
+                            <div class="w25"><span class="h-span" th:text="${item.monitorTime}"></span></div>
+                            <div class="w25"><span class="h-span" th:text="${item.status}"></span></div>
+                            <img class="table-triangle-top" th:src="@{img/triangle.png}">
+                            <img class="table-triangle-btm" th:src="@{img/triangle.png}">
+                        </li>
+                    </ul>
+                </div>
             </div>
             <div class="content-list-right flex-col">
-              <h4>本日无法访问网站列表</h4>
-              <div class="content-list-body">
-                <ul id="messageUlTwo">
-                  <li class="content-list-body-tit">
-                    <div class="w50"><h5>站点名称</h5></div>
-                    <div class="w25"><h5>最近一次检测时间</h5></div>
-                    <div class="w25"><h5>本日无法访问次数</h5></div>
-                  </li>
-                    <li th:each="item : ${dataSourceTwo}">
-                        <div class="w50"><span class="h-span" th:text="${item.siteName}"></span></div>
-                        <div class="w25"><span class="h-span" th:text="${item.lastMonitorTime}"></span></div>
-                        <div class="w25"><span class="h-span" th:text="${item.accessCountFail}"></span></div>
-                        <img class="table-triangle-top" th:src="@{img/triangle.png}">
-                        <img class="table-triangle-btm" th:src="@{img/triangle.png}">
-                    </li>
+                <h4>本日无法访问网站列表</h4>
+                <div class="content-list-body">
+                    <ul id="messageUlTwo">
+                        <li class="content-list-body-tit">
+                            <div class="w50"><h5>站点名称</h5></div>
+                            <div class="w25"><h5>最近一次检测时间</h5></div>
+                            <div class="w25"><h5>本日无法访问次数</h5></div>
+                        </li>
+                        <li th:each="item : ${dataSourceTwo}">
+                            <div class="w50"><span class="h-span" th:attr="title=${item.siteName}" th:text="${#strings.length(item.siteName) > 20}
+                  ? ${#strings.substring(item.siteName, 0, 20) + '...'}
+                  : ${item.siteName}"></span></div>
+                            <div class="w25"><span class="h-span" th:text="${item.lastMonitorTime}"></span></div>
+                            <div class="w25"><span class="h-span" th:text="${item.accessCountFail}"></span></div>
+                            <img class="table-triangle-top" th:src="@{img/triangle.png}">
+                            <img class="table-triangle-btm" th:src="@{img/triangle.png}">
+                        </li>
 
-                </ul>
-              </div>
+                    </ul>
+                </div>
             </div>
-          </div>
-       </div>
-       <!-- 正文 End -->
+        </div>
     </div>
-    <!-- 内容End -->
-    <script type="text/javascript" th:src="@{/js/socket.js}"></script>
-    <script>
-        socket.onMessage = function (res) {
-            let message = []
-            if (10014 == JSON.parse(res).code) {
-                message = JSON.parse(res).data
-                // 处理接收到的消息
-                document.getElementById("messageUlOne").innerHTML = "<li class=\"content-list-body-tit\">\n" +
-                    "                            <div class=\"w50\"><h5>站点名称</h5></div>\n" +
-                    "                            <div class=\"w25\"><h5>监测时间</h5></div>\n" +
-                    "                            <div class=\"w25\"><h5>网站状态</h5></div>\n" +
-                    "                        </li>";
-                for (let i = 0; i < message.length; i++) {
-                    document.getElementById("messageUlOne").innerHTML += "<li>\n" +
-                        `                  <div class="w50"><span>${message[i].siteName}</span></div>\n` +
-                        `                  <div class="w15"><span>${message[i].monitorTime}</span></div>\n` +
-                        `                  <div class="w15"><span>${message[i].status}</span></div>\n` +
-                        `                  <img class="table-triangle-top" th:src="@{img/triangle.png}"/>\n` +
-                        `                  <img class="table-triangle-btm" th:src="@{img/triangle.png}"/>\n` +
-                        `                </li>`
-                }
+    <!-- 正文 End -->
+</div>
+<!-- 内容End -->
+<script type="text/javascript" th:src="@{/js/socket.js}"></script>
+<script>
+    socket.onMessage = function (res) {
+        let message = []
+        if (10014 == JSON.parse(res).code) {
+            message = JSON.parse(res).data
+            // 处理接收到的消息
+            document.getElementById("messageUlOne").innerHTML = "<li class=\"content-list-body-tit\">\n" +
+                "                            <div class=\"w50\"><h5>站点名称</h5></div>\n" +
+                "                            <div class=\"w25\"><h5>监测时间</h5></div>\n" +
+                "                            <div class=\"w25\"><h5>网站状态</h5></div>\n" +
+                "                        </li>";
+            for (let i = 0; i < message.length; i++) {
+                document.getElementById("messageUlOne").innerHTML += "<li>\n" +
+                    `                  <div class="w50"><span>${message[i].siteName}</span></div>\n` +
+                    `                  <div class="w15"><span>${message[i].monitorTime}</span></div>\n` +
+                    `                  <div class="w15"><span>${message[i].status}</span></div>\n` +
+                    `                  <img class="table-triangle-top" th:src="@{img/triangle.png}"/>\n` +
+                    `                  <img class="table-triangle-btm" th:src="@{img/triangle.png}"/>\n` +
+                    `                </li>`
             }
-            if (10015 == JSON.parse(res).code) {
-                message = JSON.parse(res).data
-                // 处理接收到的消息
-                document.getElementById("messageUlTwo").innerHTML = "<li class=\"content-list-body-tit\">\n" +
-                    "              <div class=\"w50\"><h5>站点名称</h5></div>\n" +
-                    "              <div class=\"w25\"><h5>最近一次检测时间</h5></div>\n" +
-                    "              <div class=\"w25\"><h5>本日无法访问次数</h5></div>\n" +
-                    "            </li";
-                for (let i = 0; i < message.length; i++) {
-                    document.getElementById("messageUlTwo").innerHTML += "<li>\n" +
-                        `                  <div class=\"w20\"><span>${message[i].siteName}</span></div>\n` +
-                        `                  <div class=\"w10\"><span>${message[i].lastMonitorTime}</span></div>\n` +
-                        `                  <div class=\"w10 j-left\"><span>${message[i].accessCountFail}</span></div>\n` +
-                        `                  <img class="table-triangle-top" th:src="@{img/triangle.png}">\n` +
-                        `                  <img class="table-triangle-btm" th:src="@{img/triangle.png}">\n` +
-                        `                </li>`
-                }
+        }
+        if (10015 == JSON.parse(res).code) {
+            message = JSON.parse(res).data
+            // 处理接收到的消息
+            document.getElementById("messageUlTwo").innerHTML = "<li class=\"content-list-body-tit\">\n" +
+                "              <div class=\"w50\"><h5>站点名称</h5></div>\n" +
+                "              <div class=\"w25\"><h5>最近一次检测时间</h5></div>\n" +
+                "              <div class=\"w25\"><h5>本日无法访问次数</h5></div>\n" +
+                "            </li";
+            for (let i = 0; i < message.length; i++) {
+                document.getElementById("messageUlTwo").innerHTML += "<li>\n" +
+                    `                  <div class=\"w20\"><span>${message[i].siteName}</span></div>\n` +
+                    `                  <div class=\"w10\"><span>${message[i].lastMonitorTime}</span></div>\n` +
+                    `                  <div class=\"w10 j-left\"><span>${message[i].accessCountFail}</span></div>\n` +
+                    `                  <img class="table-triangle-top" th:src="@{img/triangle.png}">\n` +
+                    `                  <img class="table-triangle-btm" th:src="@{img/triangle.png}">\n` +
+                    `                </li>`
             }
-        };
+        }
+    };
 
-    </script>
+</script>
 </body>
 </html>