From b2496cf5022a8817472d0110599bc1349457026a 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:22:48 +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       | 9 ++++-----
 ruoyi-admin/src/main/resources/templates/broad/fp.html   | 4 ++--
 2 files changed, 6 insertions(+), 7 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 ada37e5..840b9e6 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
@@ -69,7 +69,7 @@ $(() => {
             }
             // 达成率
             if (targetTop.progress != 0) {
-                targetTop.rate = ((targetTop.reality / targetTop.progress)).toFixed(4) * 100
+                targetTop.rate = Number((targetTop.reality / targetTop.progress) * 100).toFixed(2)
             } else {
                 targetTop.rate = 0
             }
@@ -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 = ((data.map(val => val.rate).reduce((val1, val2) => val1 + val2, 0) / data.map(val => val.rate).length)).toFixed(4)
+            targetBottom.reality = Number((data.map(val => val.rate).reduce((val1, val2) => val1 + val2, 0) / data.map(val => val.rate).length)*100).toFixed(2)
             targetBottom.total = data.map(val => val.qty).reduce((val1, val2) => val1 + val2, 0)
             barChartAndLineChartFour({
                 xName: xName,
@@ -127,7 +127,7 @@ $(() => {
                 rowNum: 5,
                 timeout: 0,
                 header: ["订单编号", '产品型号', "计划数量", "完成数量", "执行进度", "时间"],
-                data: data.map(value => [value.plan_code.slice(4, value.plan_code.length), value.name.split('-')[1], value.plan_number, value.actual_number, value.plan_number === 0? 0 :((value.actual_number / value.plan_number)* 100 + '').slice(0, 5) + '%', value.day]),
+                data: data.map(value => [value.plan_code.slice(4, value.plan_code.length), value.name.split('-')[1], value.plan_number, value.actual_number, value.plan_number === 0 ? 0 : ((value.actual_number / value.plan_number) * 100 + '').slice(0, 5) + '%', value.day]),
                 index: false,
                 fontColor: '#B4B7BF ',
                 indexBGC: '#86F3FF',
@@ -150,8 +150,7 @@ $(() => {
     yieldTabs()
     tableAnimation('#trackEvents')
     setInterval(request, INTERVAL)
-
-
+console.log()
 })
 let yieldType = '0'
 let targetTopRaw = {
diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index e122345..7701c99 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -505,10 +505,10 @@
                 times++
             }
             getTable(classes,dataOne)
-            total(((data.filter(val => val.status === '生产中').length / 28)).toFixed(4) * 100 + '%',
+            total(Number((data.filter(val => val.status === '生产中').length / 28) * 100).toFixed(4) + '%',
                 eval(data.map(val => val.plan_number).join('+')),
                 eval(data.map(val => val.qty).join('+')),
-                ((eval(data.map(val => val.qty).join('+')) / eval(data.map(val => val.plan_number).join('+')))).toFixed(4) * 100+ '%',
+                (Number(eval(data.map(val => val.qty).join('+')) / eval(data.map(val => val.plan_number).join('+'))) * 100).toFixed(2)+ '%',
                 eval(data.map(val => val.h1).join('+')),
                 eval(data.map(val => val.h2).join('+')),
                 eval(data.map(val => val.h3).join('+')),