From 076f3dbf5cba75f7d027fb725e8a2f1bcb647933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 14 Jul 2022 17:49:45 +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/board/beforeLibrary.js     | 4 ++--
 ruoyi-admin/src/main/resources/static/js/echartsCommon.js   | 6 +++---
 ruoyi-admin/src/main/resources/templates/broad/fp.html      | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js
index 9169587..0690f75 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js
@@ -44,8 +44,8 @@ $(() => {
         }), document.getElementById("distributionOfBadTypesInProductionLineByDay"));
         barChartAndLineChart(data.map(val => {
             return {
-                xName: val.name,
-                yDataTwo: val.qty,
+                xName: data.map(value => value.name),
+                yDataTwo: data.map(value => value.qty),
                 yDataTwoName: "质量",
             }
 
diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index 99f5943..5a7c317 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1881,7 +1881,7 @@ const multipleVerticalBarChart = function (data, id) {
                 name: data.yDataOneName,
                 type: "bar",
                 data: data.yDataOne,
-                barWidth: 0.5 * vw,
+                barWidth: 1 * vw,
                 barGap: 0, //柱间距离
                 label: {
                     //图形上的文本标签
@@ -1908,7 +1908,7 @@ const multipleVerticalBarChart = function (data, id) {
                 name: data.yDataTwoName,
                 type: "bar",
                 data: data.yDataTwo,
-                barWidth: 0.5 * vw,
+                barWidth: 1 * vw,
                 barGap: 0.5, //柱间距离
                 label: {
                     //图形上的文本标签
@@ -1935,7 +1935,7 @@ const multipleVerticalBarChart = function (data, id) {
                 name: data.yDataThreeName,
                 type: "bar",
                 data: data.yDataThree,
-                barWidth: 0.5 * vw,
+                barWidth: 1 * vw,
                 barGap: 0.5, //柱间距离
                 label: {
                     //图形上的文本标签
diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index 49db783..1c2e3e4 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -487,9 +487,7 @@
 
             // data.push(consolidatedRow)
 
-            planInfo.loadData(data.map(value => [value.station_no, value.name, '正常', '0', value.plan_number,value.qty,`${value.rate}%`,value.h1,value.h2,value.h3,value.h4,value.h5,value.h6,value.h7,value.h8,value.h9,value.h10,value.h11,value.h12]), 19, {
-                includeHead: true,
-            })
+            planInfo.loadData(data.map(value => [value.station_no, value.name, '正常', '0', value.plan_number,value.qty,`${value.rate}%`,value.h1,value.h2,value.h3,value.h4,value.h5,value.h6,value.h7,value.h8,value.h9,value.h10,value.h11,value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:00','9:00','10:00','11:00','12:00','13:00','14:00','15:00','16:00','17:00','18:00','19:00']))
             //data.map(value => [value.orderType, value.plannedProduction, value.actualProduction, value.plannedProduction - value.actualProduction, `${(value.actualProduction / value.plannedProduction * 100).toFixed(2)}%`]
         })
 
@@ -888,6 +886,8 @@
         <span style="position: absolute;top:37.6%;left:56%;font-size: 1vw;"> A2</span>
         <span style="position: absolute;top:46%;left:51%;font-size: 1vw;"> A3</span>
         <span style="position: absolute;top:40.7%;left:65%;font-size: 1vw;"> A4</span>
+    <span style="position: absolute;top: 10.3%;left: 75%;color: #CFD2D0;font-size: 1.0vw">压力统计</span>
+    <span style="position: absolute;top: 38.3%;left: 75%;color: #CFD2D0;font-size: 1.0vw">温度统计</span>
         `
         $("body").append(html)
     }