diff --git a/ruoyi-admin/src/main/resources/static/img/foamer2.jpg b/ruoyi-admin/src/main/resources/static/img/foamer2.jpg index 5574021..bbd80c7 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/foamer2.jpg and b/ruoyi-admin/src/main/resources/static/img/foamer2.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/js/autoscroll-table.js b/ruoyi-admin/src/main/resources/static/js/autoscroll-table.js index ecdb7e0..3ca02d6 100644 --- a/ruoyi-admin/src/main/resources/static/js/autoscroll-table.js +++ b/ruoyi-admin/src/main/resources/static/js/autoscroll-table.js @@ -7,7 +7,8 @@ class AutoScrollTable { init = true, loadingSplash = true, caption = null, - } = {}) { + } = {},lineNum = 5) { + this.lineNum = lineNum this.el = el this.columns = columns this.width = width @@ -259,7 +260,7 @@ class AutoScrollTable { thead.style.width = window.getComputedStyle(tbody).width let tr = this.el.querySelectorAll(".autoscroll-table .autoscroll-table_tbody1 tr") tr.forEach(val => { - val.style.lineHeight = `${(parseFloat(window.getComputedStyle(parent).height) - parseFloat(window.getComputedStyle(theadRow).height))/5}px` + val.style.lineHeight = `${(parseFloat(window.getComputedStyle(parent).height) - parseFloat(window.getComputedStyle(theadRow).height))/this.lineNum}px` }) shadow.style.display ='none' diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html index 76cf38f..0f32ae8 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/fp.html +++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html @@ -45,7 +45,6 @@ justify-content: space-around; display: flex; position: absolute; - border: 1px solid red; width: 68%; height: 3.9%; top: 91.4%; @@ -352,9 +351,13 @@