修改界面

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'

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 @@
 <script src="../../static/js/auto-update.js" th:src="@{/js/auto-update.js}"></script>
 <script>
     //夹具生产计划切换
+    let tableData = []
+    let classes = 0
     showalert();
 
-    window.setInterval(showalert, 1000 * 30);
+    window.setInterval(showalert, 1000 * 15);
+    let isFirst = true
+    let times = 1
 
     function showalert() {
         var myTransition = $('.my-transition');
@@ -366,6 +369,35 @@
             myTransition2.removeClass('my-click-transiton');
             $('.my-transition').addClass('my-click-transiton');
         }
+        if (tableData.length === 0) return
+        console.log(times)
+        let dataTwo = tableData.slice(times*7,times*7 + 7)
+        if (classes === 0){
+            planInfo = new AutoScrollTable(document.getElementById("my-transition"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30'], {
+                width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
+            },7)
+
+            planInfo2 = new AutoScrollTable(document.getElementById("my-transition2"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30'], {
+                width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
+            },7)
+            planInfo.loadData(dataTwo.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30']))
+            planInfo2.loadData(dataTwo.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30']))
+        }else{
+            planInfo = new AutoScrollTable(document.getElementById("my-transition"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30', '7:30'], {
+                width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
+            },7)
+
+            planInfo2 = new AutoScrollTable(document.getElementById("my-transition2"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30', '7:30'], {
+                width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
+            },7)
+            planInfo.loadData(dataTwo.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30', '7:30']))
+            planInfo2.loadData(dataTwo.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30', '7:30']))
+        }
+        if(times < 3) {
+            times += 1
+        }else{
+            times = 0
+        }
     }
 
 
@@ -393,13 +425,13 @@
     }
 
     // 生产统计数据
-    const planInfo = new AutoScrollTable(document.getElementById("my-transition"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30'], {
+    let planInfo = new AutoScrollTable(document.getElementById("my-transition"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30'], {
         width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
-    })
+    },7)
 
-    const planInfo2 = new AutoScrollTable(document.getElementById("my-transition2"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30'], {
+    let planInfo2 = new AutoScrollTable(document.getElementById("my-transition2"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30'], {
         width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
-    })
+    },7)
 
     // 切换中心运行状态
     function updateStatus(id, status) {
@@ -449,31 +481,28 @@
             // let p = [data[1], data[0][2], data[0][3]]
             let plan = data.find(val => val.name == '当班计划').qty
             let now = data.find(val => val.name == '实际产量').qty
-            console.log(now)
             let p = [plan, now, plan - now]
 
             for (let i in p) {
                 updateSplitBlocks(p[i], selectors[i])
             }
         })
+        // 获取班次
+        autoUpdate('/broad/fp/selectTeamGroups', INTERVAL, data => {
+            classes = data
+        })
         // 生产统计数据
         autoUpdate('/broad/fp/selectStationHourInfo', INTERVAL, data => {
-            // $('#bottom-left').remove()
+            tableData = data
-            // $('.my-transition').append('<div class="bottom-left" id="bottom-left"></div>')
+            let dataOne = []
-            // dynamicTable({
+            if(isFirst) {
-            //     el: '#bottom-left',
+                dataOne = data.slice(0,  7)
-            //     rowNum: 7,
+                isFirst = false
-            //     timeout: 0,
+            }else{
-            //     header: ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:00'],
+                times--
-            //     data: data.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]),
+                dataOne = data.slice(times * 7, times * 7 + 7)
-            //     index: false,
+                times++
-            //     fontColor: '#B4B7BF ',
+            }
-            //     indexBGC: '#86F3FF',
-            //     headerBGC: 'rgba(8,36,75,0.2)',
-            //     oddRowBGC: 'rgba(8,36,75,0.2)',
-            //     evenRowBGC: 'rgba(6,25,57,0.2)',
-            //     colWidth: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"]
-            // });
             // let consolidatedRow = ["", "合计", ""]
             //
             // for (let i = 3; i < 19; i++) {
@@ -501,8 +530,29 @@
             //
             // data.push(consolidatedRow)
 
-            planInfo.loadData(data.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:00','9:00','10:00','11:00','12:00','13:00','14:00','15:00','16:00','17:00','18:00','19:30']))
+            if (classes === 0){
-            planInfo2.loadData(data.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:00','9:00','10:00','11:00','12:00','13:00','14:00','15:00','16:00','17:00','18:00','19:30']))
+                 planInfo = new AutoScrollTable(document.getElementById("my-transition"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30'], {
+                width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
+            },7)
+
+                 planInfo2 = new AutoScrollTable(document.getElementById("my-transition2"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30'], {
+                    width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
+                },7)
+                planInfo.loadData(dataOne.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30']))
+                planInfo2.loadData(dataOne.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:30']))
+            }else{
+                planInfo = new AutoScrollTable(document.getElementById("my-transition"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30', '7:30'], {
+                    width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
+                },7)
+
+                planInfo2 = new AutoScrollTable(document.getElementById("my-transition2"), ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30', '7:30'], {
+                    width: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
+                },7)
+                planInfo.loadData(dataOne.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30', '7:30']))
+                planInfo2.loadData(dataOne.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30', '7:30']))
+            }
+
+            // times = 1
             // data.map(value => [value.orderType, value.plannedProduction, value.actualProduction, value.plannedProduction - value.actualProduction, `${(value.actualProduction / value.plannedProduction * 100).toFixed(2)}%`])
             total((data.filter(val => val.status === '生产中').length/28).toFixed(4)*100 + '%',
                 eval(data.map(val => val.plan_number).join('+')),
@@ -522,7 +572,6 @@
                 eval(data.map(val => val.h12).join('+')),
             )
         })
-        // flip('#bottom-left')
 
 
         // 右侧压力 + 右侧温度
@@ -899,8 +948,6 @@
         <span style="position: absolute;top:37.6%;left:56%;font-size: 1vw;"> B2</span>
         <span style="position: absolute;top:46%;left:51%;font-size: 1vw;"> B1</span>
         <span style="position: absolute;top:40.7%;left:65%;font-size: 1vw;"> A2</span>
-    <span style="position: absolute;top: 10.5%;left: 74.6%;color: #CFD2D0;font-size: 0.8vw">发泡注料压力监控</span>
-    <span style="position: absolute;top: 38.5%;left: 74.6%;color: #CFD2D0;font-size: 0.8vw">发泡注料温度监控</span>
         `
         $("body").append(html)
     }