diff --git a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js index 840b9e6..ea7bc2f 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js +++ b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js @@ -150,7 +150,6 @@ $(() => { yieldTabs() tableAnimation('#trackEvents') setInterval(request, INTERVAL) -console.log() }) let yieldType = '0' let targetTopRaw = { diff --git a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js index 8c8bbca..73c9801 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js +++ b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js @@ -134,7 +134,7 @@ $(() => { }) // 三日订单执行情况 - autoUpdate(url + "/inStore3d", INTERVAL, data => { + autoUpdate(url + "/selectOrderInfoBy3d", INTERVAL, data => { console.log(data) horizontalRoundedBarChartWithBackgroundTwo({ yNameOne: data.map(val => val.name), @@ -143,6 +143,10 @@ $(() => { }, document.getElementById("IQC")) }) + autoUpdate(url + "/mtk_selectOrderInfoBy3dTatle", INTERVAL, data => { + console.log(data) + Tips(data.find(val => val.name === '订单数量').qty, data.find(val => val.name === '完成数量').qty, data.find(val => val.name === '清单率').qty, '#Tips') + }) // 设备功率 // autoUpdate(url + "/inStore3d", INTERVAL, data => { singleVerticalBarChart({ diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js index 78d170e..a410bb9 100644 --- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js +++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js @@ -209,7 +209,7 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) { type: "bar", yAxisIndex: 0, data: data.yData, - barWidth: vw, + barWidth: '80%', itemStyle: { normal: { barBorderRadius: 30, @@ -226,7 +226,7 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) { yAxisIndex: 1, barGap: "-100%", data: bgBar, - barWidth: 1.2 * vw, + barWidth: '90%', itemStyle: { normal: { color: "none",