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

src/main/webapp/HG/BI/HGBI002.jsp

@@ -106,6 +106,7 @@
 
     <script src="${iPlatStaticURL}/iplatui/assets/js/iplat.ui.bootstrap.min.js"></script>
     <script src="${iPlatStaticURL}/iplatui/js/iplat.ui.min.js"></script>
+    <script src="${ctx}/common/js/public.js"></script>
     <script src="${ctx}/common/js/dayjs.min.js"></script>
     <script src="${ctx}/common/js/vue-2.6.10.js"></script>
     <script src="${ctx}/common/js/httpVueLoader.js"></script>
@@ -558,6 +559,49 @@
         flex-wrap: wrap;
         padding-left: 1vw;
     }
+    .page-content-main .el-table, .el-table__expanded-cell{
+        background-color: transparent!important;
+    }
+    .page-content-main .el-table__cell .cell{
+        font-size: 10px;
+        padding: 0;
+    }
+    .page-content-main .el-table tr{
+        background-color: transparent!important;
+
+    }
+    .page-content-main .el-table--border, .el-table--group{
+        /*border-color: #4295f7;*/
+        border-color: transparent!important;
+    }
+    .page-content-main .el-table td.el-table__cell, .el-table th.el-table__cell{
+        background-color: transparent!important;
+        border-color: transparent!important;
+    }
+    .page-content-main .el-table--border .el-table__cell .cell{
+        padding-left: 0;
+    }
+    .page-content-main .el-table th.el-table__cell > .cell {
+        padding-right: 0;
+    }
+    .page-content-main .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+        color: #ffffff;
+        border-color: transparent!important;
+        font-size: 0.8vw;
+    }
+    .page-content-main .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf .cell{
+        font-size: 0.68vw;
+    }
+    .page-content-main .el-table--border th.el-table__cell.gutter:last-of-type{
+        border-color: transparent!important;
+    }
+    .page-content-main .el-table--border::after, .el-table--group::after, .el-table::before{
+        /*background-color: #4295f7!important;*/
+        background-color: transparent!important;
+    }
+    .page-content-main tr{
+        border-bottom:1px solid #4295f7!important;
+    }
 </style>
 </body>
 </html>

src/main/webapp/HG/BI/HGBI003.jsp

@@ -540,7 +540,7 @@
                     },
                     series: [
                         {
-                            data: [0, 0, 0, 0, 0, 0, 0],
+                            data: [350, 240, 460, 245, 467, 234, 562],
                             type: 'line',
                             smooth: true,
                             itemStyle: {
@@ -591,7 +591,7 @@
                     },
                     series: [
                         {
-                            data: [24, 24, 24, 24, 24, 24, 24],
+                            data: [30, 45, 50, 23, 24, 18, 80],
                             type: 'line',
                             smooth: true,
                             itemStyle: {

src/main/webapp/common/js/public.js

+let timer1 = {}
+
+const tableContentScroll = (el) => {
+    if (timer1[el]) {
+        clearInterval(timer1[el])
+        timer1[el] = null;
+    }
+    setTimeout(()=>{
+        let i = $("#" + el + ' .el-table__body-wrapper table');
+        let i2 =  $("#" + el + ' .el-table__body-wrapper');
+        let a = 0;
+        let boxHeight = i.height();
+        let height = i2.height();
+        let num = boxHeight - height;
+        // console.log(boxHeight, height, num,"高度数据")
+        let run = () => {
+            if (num > 0) {
+                timer1[el] = setInterval(() => {
+                    a = a + 0.07;
+                    if (a >= num) {
+                        a = 0
+                    }
+                    i2.scrollTop(a);
+                }, 10)
+            }
+        }
+        run()
+        i.on('mouseenter', () => {
+            clearInterval(timer1[el])
+            timer1[el] = null
+            i2.on('scroll',()=>{
+                a = i2.scrollTop();
+            })
+        })
+        i.on("mouseleave",()=>{
+            i2.off("scroll");
+            if(!timer1[el]){
+                run()
+            }
+        })
+    },50)
+}