From 4976d96f92bde69a84f24b88638a8ef921c401a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 15 Jul 2022 17:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/js/echartsCommon.js  |  2 +-
 .../src/main/resources/templates/broad/box.html    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index f753a94..14bc197 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1854,7 +1854,7 @@ const multipleVerticalBarChart = function (data, id) {
         yAxis: {
             type: "value",
             splitNumber: 5,
-            max: Math.max(...data['yDataOne'],...data['yDataTwo'],...data['yDataThree']) + 5,
+            max: Math.max(...data.yDataOne,...data.yDataTwo) + 5,
             axisLabel: {
                 show: true,
                 color: '#fff'
diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html
index 5ee7739..99a11c1 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/box.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/box.html
@@ -157,7 +157,7 @@
             width: 13%;
             height: 5.6%;
             position: absolute;
-            top: 10.5%;
+            top: 10%;
             left: 10%;
             letter-spacing: 1px;
             font-size: 12%;
@@ -167,7 +167,7 @@
             /*width: 13%;*/
             /*height: 5.6%;*/
             /*position: absolute;*/
-            /*top: 10.5%;*/
+            /*top: 10%;*/
             /*left: 10%;*/
             /*letter-spacing: 1px;*/
             /*font-size: 12%;*/
@@ -184,7 +184,7 @@
             width: 13%;
             height: 5.6%;
             position: absolute;
-            top: 10.5%;
+            top: 10%;
             left: 20.2%;
             letter-spacing: 1px;
             font-size: 12%;
@@ -194,7 +194,7 @@
             width: 13%;
             height: 5.6%;
             position: absolute;
-            top: 10.5%;
+            top: 10%;
             left: 34.6%;
             letter-spacing: 1px;
             font-size: 12%;
@@ -205,7 +205,7 @@
             width: 13%;
             height: 5.6%;
             position: absolute;
-            top: 10.5%;
+            top: 10%;
             left: 59.3%;
             letter-spacing: 1px;
             font-size: 12%;
@@ -216,7 +216,7 @@
             width: 13%;
             height: 5.6%;
             position: absolute;
-            top: 10.5%;
+            top: 10%;
             left: 83.5%;
             letter-spacing: 1px;
             font-size: 12%;
@@ -390,7 +390,7 @@
         let url = '/broad/box'
         //生产计划工单
         autoUpdate(url+"/getProductPlanInfo ", INTERVAL, data => {
-              planWorkOrderTable.loadData(data.map((value,index) => [index+1,value.plan_name, value.plan_number, value.actual_number, value.rate, value.day]), Object.keys(planWorkOrderColumns))
+              planWorkOrderTable.loadData(data.map((value,index) => [index+1,value.name, value.plan_number, value.actual_number, value.rate, value.day]), Object.keys(planWorkOrderColumns))
           })
 
         autoUpdate(url + '/selectStock/S001', INTERVAL, data => {