Merge remote-tracking branch 'gitee/master'

ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js

@@ -47,8 +47,8 @@ $(() => {
                 for (let i = 0; i < 12; i++) {
                     arr.push(Math.ceil(targetTop.tips / 11))
                 }
-                arr[3] = Math.ceil(targetTop.tips / 22)
+                arr[2] = Math.ceil(targetTop.tips / 22)
-                arr[8] = Math.ceil(targetTop.tips / 22)
+                arr[7] = Math.ceil(targetTop.tips / 22)
                 arr[0] = arr[0] - (arr.reduce((val1, val2) => val1 + val2, 0) - targetTop.tips)
                 targetTop.targetArr = arr
                 let num = 0

ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js

@@ -8,7 +8,7 @@ $(() => {
     deviceNameOne('28工位箱体发泡线', 25, 59)
     deviceNameOne('箱壳自动成型线', 37, 48)
     deviceNameOne('成品分垛入库', 44, 18)
-    deviceNameOne('内胆底生产线', 52, 43)
+    deviceNameOne('内胆底成型线', 52, 43)
     deviceNameOne('压合区', 57, 61)
     deviceNameOne('展厅', 49, 80)
     deviceNameOne('蒸发器绕管机', 60, 43.5)

ruoyi-admin/src/main/resources/static/js/echartsCommon.js

@@ -1522,14 +1522,17 @@ const pieChartTwo = function (data, id, unit = '次') {
             {
                 name: "访问来源",
                 type: "pie",
-                radius: "70%",
+                radius: "50%",
                 center: ["50%", "50%"],
                 colorBy: 'data',
                 // color: ["rgb(131,249,103)", "#FBFE27", "#FE5050", "#1DB7E5"], //'#FBFE27','rgb(11,228,96)','#FE5050'
                 data: data,
                 roseType: "radius",
+                overflow:'break',
                 label: {
+                    overflow:'break',
                     normal: {
+                        overflow:'break',
                         formatter: `{b|{b}} \n {c|{c}${unit}}`,
                         rich: {
                             c: {
@@ -1556,8 +1559,8 @@ const pieChartTwo = function (data, id, unit = '次') {
                             color: "rgb(98,137,169)",
                         },
                         smooth: true,
-                        length: 20,
+                        length: 5,
-                        length2: 20,
+                        length2: 5,
                     },
                 },
             },

ruoyi-admin/src/main/resources/templates/broad/fp.html

@@ -24,7 +24,7 @@
         height: 20%;
         top: 14.85%;
         left: 3.4%;
-        /*font-size: 12%;*/
+        font-size: 8%;
         /*padding-left: 1%;
         padding-top: 0.7%;*/
     }
@@ -226,8 +226,10 @@
 -->
 
 <!--订单执行-->
+<div class="topLeftDiv" id="topLeftDiv">
     <div id="top-left">
     </div>
+</div>
 
 <!--生产统计-->
 <div id="mid-left">
@@ -420,9 +422,9 @@
         "差异数",
         "执行进度"
     ];
-    const orderInf = new AutoScrollTable(document.getElementById("top-left"), orderInfColumns, {
+    // const orderInf = new AutoScrollTable(document.getElementById("top-left"), orderInfColumns, {
-        width: ['30%', '14.5%', '14.5%', '14.5%', '14.5%']
+    //     width: ['30%', '14.5%', '14.5%', '14.5%', '14.5%']
-    })
+    // })
 
     let selectors = []
     let tmp = []
@@ -474,9 +476,46 @@
         })
         // 订单执行 + 生产统计
         autoUpdate('/broad/fp/selectOrderExecutionPlan', INTERVAL, data => {
-            orderInf.loadData(data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, `${value.rate == 0 ? value.rate : value.rate + '%'}`]), Object.keys(orderInfColumns))
+
+            const tableFun = () => {
+                const tableRes = {
+                    data: data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, `${value.rate == 0 ? value.rate : value.rate + '%'}`]),
+                    header: [
+                        "型号",
+                        "计划数",
+                        "完成数",
+                        "差异数",
+                        "执行进度"
+                    ]
+                }
+                const getTable = () => {
+                    $('#top-left').remove()
+                    $('.topLeftDiv').html('<div class="top-left" id="top-left"></div>')
+                    dynamicTable({
+                        el: '#top-left',
+                        rowNum: 4,
+                        timeout: 0,
+                        header: tableRes.header,
+                        data: tableRes.data,
+                        index: false,
+                        fontColor: '#B4B7BF ',
+                        indexBGC: '#86F3FF',
+                        headerBGC: 'rgba(8,36,75,0.2)',
+                        oddRowBGC: 'rgba(8,36,75,0.2)',
+                        evenRowBGC: 'rgba(8,36,75,0.2)',
+                        colWidth: ['30%', '14%', '15%', '14%', '15%']
+                    });
+                }
+                getTable()
+                setInterval(() => {
+                    getTable()
+                }, 10000);
+            }
+            tableFun()
+            // orderInf.loadData(data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, `${value.rate == 0 ? value.rate : value.rate + '%'}`]), Object.keys(orderInfColumns))
 
         })
+        tableAnimation('#top-left')
         autoUpdate('/broad/fp/selectOrderExecution', INTERVAL, data => {
             modelChart.setOption({
                 xAxis: {
@@ -780,7 +819,7 @@
     })
 
     function resize() {
-        orderInf.resize()
+        // orderInf.resize()
         // planInfo.resize()
         // planInfo2.resize()
         modelChart.resize()

ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html

@@ -99,7 +99,7 @@
     <img alt="" src="../img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif"
          style="width: 3vw;height: 1.4vh;position: absolute;top: 33%;left: 67.6%;object-fit: contain;transform: rotate(0deg);">
     <img alt="" src="../img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif"
-         style="width: 4.6vw;height: 0.8vh;position: absolute;top: 34.4%;left: 74.5%;object-fit: contain;transform: rotate(279deg);">
+         style="width: 4.6vw;height: 0.8vh;position: absolute;top: 34.4%;left: 76%;object-fit: contain;transform: rotate(279deg);">
     <img alt="" src="../img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif"
          style="width: 3vw;height: 1.4vh;position: absolute;top: 25.7%;left: 77.1%;object-fit: contain;transform: rotate(70deg);">
     <img alt="" src="../img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif"