From 9e3d04cfb75e8ef764072320bc005ca2e389e46f 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 10:15:06 +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

---
 .../static/js/board/beforeLibrary.js          | 21 +++++++++++++++----
 .../templates/broad/beforeLibrary.html        |  3 +++
 2 files changed, 20 insertions(+), 4 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 ae3af4a..7c1a057 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js
@@ -3,6 +3,12 @@ $(() => {
     // 公共请求地址
     let url = '/broad/beforeLibrary'
 
+    // 订单详情
+    const orderDetailsTable = new AutoScrollTable(document.getElementById("orderDetails"), ["编号", "计划数量", "完成数量", "差异值", "时间",], {width: ['30%', null, null, null, '17%']})
+
+    // 成品质量详情
+    const PropertyInsuranceOneDayOrderInfoTable = new AutoScrollTable(document.getElementById("PropertyInsuranceOneDayOrderInfo"), ["物料条码", "检测项", "质量缺陷", "标志", "时间"], {width: ['30%', null, null, null, '17%']})
+
     //订单详情轮询 + 当日订单数量达成率轮询
     autoUpdate(url + "/selectOrderInfo ", INTERVAL, data => {
         orderDetailsTable.loadData(data.map(value => [value.plan_code, value.plan_number, value.actual_number, value.plan_number - value.actual_number, value.day]), Object.keys(planWorkOrderColumns))
@@ -27,16 +33,23 @@ $(() => {
         PropertyInsuranceOneDayOrderInfoTable.loadData(data.map(value => [value.code, value.item, value.qa, value.state, value.day]), Object.keys(planWorkOrderColumns))
     })
 
-    //产线不良类型分布轮询
+    //产线不良类型分布 + 质量统计轮询
     autoUpdate(url + "/selectQualityItem ", INTERVAL, data => {
-        let params = data.map(val => {
+        pieChart(data.map(val => {
             return {
                 name: val.name,
                 value: val.qty
             }
 
-        })
-        pieChart(params, document.getElementById("distributionOfBadTypesInProductionLineByDay"));
+        }), document.getElementById("distributionOfBadTypesInProductionLineByDay"));
+        barChartAndLineChart(data.map(val => {
+            return {
+                xName: val.name,
+                yDataTwo: val.qty,
+                yDataTwoName: "质量",
+            }
+
+        }), document.getElementById("FinishedGoodsWarehousingStatisticsByHour"));
     })
 
 })
diff --git a/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html b/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html
index d231d7d..876f9ff 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html
@@ -33,6 +33,9 @@
 <!--当日订单数量达成率-->
 <div class="orderQuantityFulfillmentRateOfTheDay" id="orderQuantityFulfillmentRateOfTheDay"></div>
 
+<!--质量统计-->
+<div class="statisticOfAttribute" id="statisticOfAttribute"></div>
+
 <!--成品入库统计-->
 <div class="FinishedGoodsWarehousingStatisticsByHour" id="FinishedGoodsWarehousingStatisticsByHour"></div>