From 385d26d75809ba4999df4959c87512b53a7c480b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Sat, 23 Jul 2022 14:41:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/js/board/finalAssemblyProductionData.js          | 1 -
 .../main/resources/static/js/board/orderVisualization.js    | 6 +++++-
 ruoyi-admin/src/main/resources/static/js/echartsCommon.js   | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

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",