From d96785a9229a12ba3f98d0d6f78ff91cca54a3f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Wed, 4 Dec 2024 11:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw-ui/src/views/board/production/fifthFloor.vue | 2 +-
 hw-ui/src/views/board/production/thirdFloor.vue | 4 ++--
 hw-ui/src/views/board/warehouse/secondFloor.vue | 2 +-
 hw-ui/src/views/board/warehouse/thirdFloor.vue  | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hw-ui/src/views/board/production/fifthFloor.vue b/hw-ui/src/views/board/production/fifthFloor.vue
index 78b8ede5..3782143a 100644
--- a/hw-ui/src/views/board/production/fifthFloor.vue
+++ b/hw-ui/src/views/board/production/fifthFloor.vue
@@ -274,7 +274,7 @@ export default {
         this.topData.planAmount = [...[0, 0, 0, 0], ...(e.data.planAmount || 0).toString().split('')].slice(-4)
         this.topData.completeAmount = [...[0, 0, 0, 0], ...(e.data.completeAmount || 0).toString().split('')].slice(-4)
         this.topData.diff = [...[0, 0, 0, 0], ...Math.abs((parseFloat(e.data.planAmount) - parseFloat(e.data.completeAmount)) || 0).toString().split('')].slice(-4)
-        this.topData.rate = parseFloat(e.data.planAmount) === 0 ? [0, 0, 0] : [...[0, 0, 0], ...((parseFloat(e.data.completeAmount) / parseFloat(e.data.planAmount)) || 0).toString().split('')].slice(-3)
+        this.topData.rate = parseFloat(e.data.planAmount) === 0 ? [0, 0, 0] : [...[0, 0, 0], ...(((parseFloat(e.data.completeAmount) / parseFloat(e.data.planAmount)) || 0)*100).toFixed(0).split('')].slice(-3)
       })
       productionQualified().then(e => {
         // console.log(e)
diff --git a/hw-ui/src/views/board/production/thirdFloor.vue b/hw-ui/src/views/board/production/thirdFloor.vue
index 3f27f9e2..ab999eb3 100644
--- a/hw-ui/src/views/board/production/thirdFloor.vue
+++ b/hw-ui/src/views/board/production/thirdFloor.vue
@@ -211,7 +211,7 @@ export default {
             planAmount: v.planAmount,
             completeAmount: v.completeAmount,
             quantityAmount: parseFloat(v.planAmount) - parseFloat(v.completeAmount),
-            finishingRate: parseFloat(v.completeAmount) === 0 ? 0 : (parseFloat(v.completeAmount) / parseFloat(v.completeAmount)) * 100
+            finishingRate: parseFloat(v.completeAmount) === 0 ? 0 : (parseFloat(v.completeAmount) / parseFloat(v.planAmount)) * 100
           }
         })
       })
@@ -499,7 +499,7 @@ export default {
             }
           },
           xAxis: {
-            data: e.data.map(v => parseTime(v.week,'{h}:{s}')),
+            data: e.data.map(v => parseTime(v.week,'{m}-{d} {h}:{s}')),
             axisLabel: {
               margin: 10,
               color: '#ffffff63'
diff --git a/hw-ui/src/views/board/warehouse/secondFloor.vue b/hw-ui/src/views/board/warehouse/secondFloor.vue
index cb37d3b0..1b6ff604 100644
--- a/hw-ui/src/views/board/warehouse/secondFloor.vue
+++ b/hw-ui/src/views/board/warehouse/secondFloor.vue
@@ -291,7 +291,7 @@ export default {
             }
           },
           xAxis: {
-            data: e.data.map(v => parseTime(v.day,'{h}:{s}')),
+            data: e.data.map(v => parseTime(v.day,'{m}-{d} {h}:{s}')),
             axisLabel: {
               margin: 10,
               color: '#ffffff63'
diff --git a/hw-ui/src/views/board/warehouse/thirdFloor.vue b/hw-ui/src/views/board/warehouse/thirdFloor.vue
index c3fa057f..b9c1523e 100644
--- a/hw-ui/src/views/board/warehouse/thirdFloor.vue
+++ b/hw-ui/src/views/board/warehouse/thirdFloor.vue
@@ -230,7 +230,7 @@ export default {
             }
           },
           xAxis: {
-            data: e.data.map(v => parseTime(v.week,'{h}:{s}')),
+            data: e.data.map(v => parseTime(v.week,'{m}-{d} {h}:{s}')),
             axisLabel: {
               margin: 10,
               color: '#ffffff63'
@@ -373,11 +373,12 @@ export default {
         })
       })
       productPlan().then(e => {
+        console.log(e)
         this.scrollTableData = e.data.map(v => {
           return {
             taskCode: v.taskCode,
             taskType: v.taskType,
-            materialId: v.materialId,
+            materialId: v.materialName,
             rawOutstockId: v.rawOutstockId,
             applyDate: v.applyDate
           }