From 44aa424ce6136d58c6d95fe7ddfb8b177c0f91a8 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 15:21:13 +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

---
 .../resources/static/js/board/finalAssemblyProductionData.js | 2 +-
 .../src/main/resources/static/js/board/orderVisualization.js | 4 ++--
 ruoyi-admin/src/main/resources/static/js/echartsCommon.js    | 5 +++--
 3 files changed, 6 insertions(+), 5 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 5fcdfd1..a3ecf31 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
@@ -103,7 +103,7 @@ $(() => {
                 targetBottom.targetArr = arr
                 xName = ['0:00', '1:00', '2:00', '3:00', '4:00', '5:00', '6:00', '7:00', '8:00', '9:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00']
             }
-            targetBottom.reality = Number((data.map(val => val.rate).reduce((val1, val2) => val1 + val2, 0) / data.map(val => val.rate).length)*100).toFixed(2)
+            targetBottom.reality = Number((data.map(val => val.rate).reduce((val1, val2) => val1 + val2, 0) / data.map(val => val.rate).length)).toFixed(2)
             targetBottom.total = data.map(val => val.qty).reduce((val1, val2) => val1 + val2, 0)
             barChartAndLineChartFour({
                 xName: xName,
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 2bea224..551e456 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
@@ -158,8 +158,8 @@ $(() => {
         console.log(data)
         singleVerticalBarChart({
             xName: data.map(val => val.name),
-            yData: [12, 20, 11, 30, 14, 80, 50],
-        }, document.getElementById("productionEfficiency"))
+            yData: data.map(val => val.qty),
+        }, document.getElementById("productionEfficiency"),-20)
     })
     // 成品入库统计
     // autoUpdate(url + "/inStore3d", INTERVAL, data => {
diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index a410bb9..861f1ce 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1497,7 +1497,7 @@ const multipleVerticalBarChartTwo = function (data, id) {
 }
 
 // 单个垂直柱状图
-const singleVerticalBarChart = function (data, id) {
+const singleVerticalBarChart = function (data, id,rotate=0) {
     let charts = echarts.init(id);
     if (!data) {
         data = {
@@ -1514,7 +1514,7 @@ const singleVerticalBarChart = function (data, id) {
             top: "10%",
             left: left(),
             right: "5%",
-            bottom: "25%",
+            bottom: "15%",
             // containLabel: true
         },
         dataZoom: [],
@@ -1528,6 +1528,7 @@ const singleVerticalBarChart = function (data, id) {
             axisLabel: {
                 color: "#fff",
                 fontSize: 14,
+                rotate: rotate,
             },
         },
         yAxis: {