From e6fedb169fa7e5a9898430fd31b66e83e6fe7598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 26 Mar 2025 19:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E8=AE=A2=E5=8D=95=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SmartScreen/OrderScreen/charts/chart1.vue   | 17 ++++++++---------
 src/views/SmartScreen/OrderScreen/index.css     |  2 +-
 src/views/SmartScreen/OrderScreen/index.vue     |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/SmartScreen/OrderScreen/charts/chart1.vue b/src/views/SmartScreen/OrderScreen/charts/chart1.vue
index 79af96c..708005a 100644
--- a/src/views/SmartScreen/OrderScreen/charts/chart1.vue
+++ b/src/views/SmartScreen/OrderScreen/charts/chart1.vue
@@ -1,16 +1,16 @@
 <template>
     <div>
-        <div class="title">{{ title }}</div>
-        <el-table height="700" :data="dataList" v-loading="loading" ref="tableRef" @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+        <!-- <div class="title">{{ title }}</div> -->
+        <el-table height="600" :data="dataList" v-loading="loading" ref="tableRef" @mouseover.native="clearScroll" @mouseleave.native="createScroll">
             <el-table-column align="center" type="index" width="60" label="序号" />
             <el-table-column align="center" width="140" prop="orderNoMes" label="订单号" />
             <el-table-column align="center" width="140" prop="materialName" label="物料名称" />
-            <el-table-column align="center" width="80" prop="demandQuantity" label="计划数量" />
-            <el-table-column align="center" width="80" prop="demandQuantity" label="完成数量" />
-            <el-table-column align="center" label="工序">
+            <el-table-column align="center" width="80" prop="planNum" label="计划数量" />
+            <el-table-column align="center" width="80" prop="finishNum" label="完成数量" />
+            <el-table-column align="center" prop="productionProcesses" label="工序">
                 <template #default="scope">
                     <div class="process-box">
-                        <div :class="getProcessItemClass(item, scope.row)" v-for="(item, index) in processList" :key="index">
+                        <div class="process-item" :class="getProcessItemClass(item, scope.row)" v-for="(item, index) in processList" :key="index">
                             <span>{{ item.name }} :</span>
                             <span>{{ getProcessItemData(item, scope.row) }}</span>
                         </div>
@@ -43,7 +43,7 @@ const tableRef = ref(null)
 
 // 获取工序项的数据
 function getProcessItemData(processItem, row) {
-    return row.list.find((item) => item.processId === processItem.id)?.num || 0
+    return row.productionProcesses.find((item) => item.id === processItem.id)?.num || 0
 }
 
 // 获取工序项的类名
@@ -124,8 +124,7 @@ onUnmounted(() => {
     margin: 10px;
     height: 40px;
     padding: 10px;
-
-    font-size: 14px;
+    font-size: 12px;
     font-weight: bold;
     display: flex;
     flex-direction: row;
diff --git a/src/views/SmartScreen/OrderScreen/index.css b/src/views/SmartScreen/OrderScreen/index.css
index e34bed7..442c66f 100644
--- a/src/views/SmartScreen/OrderScreen/index.css
+++ b/src/views/SmartScreen/OrderScreen/index.css
@@ -66,5 +66,5 @@ body {
 }
 .main-box {
     min-height: 60px;
-    padding: 40px;
+    margin: 0 20px;
 }
diff --git a/src/views/SmartScreen/OrderScreen/index.vue b/src/views/SmartScreen/OrderScreen/index.vue
index b38d899..c18686f 100644
--- a/src/views/SmartScreen/OrderScreen/index.vue
+++ b/src/views/SmartScreen/OrderScreen/index.vue
@@ -11,7 +11,7 @@
             <kbTime></kbTime>
         </div>
         <div class="header">
-            <kbHeader>车间订单看板</kbHeader>
+            <kbHeader>车间订单进度看板</kbHeader>
         </div>
         <div class="body">
             <div class="top-box">