From 2bd0fcde8d7e14b3422903fa9da2c1438074f787 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 21 Apr 2026 16:34:30 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92/=E4=BB=BB=E5=8A=A1=E5=8D=95=E6=8E=92=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E8=A1=A8-=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/plan/index.vue             | 36 +++++++++++++++++++++++-
 src/views/mes/productionReport/index.vue | 12 ++++----
 src/views/mes/tasksummary/index.vue      | 12 ++++----
 3 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index 089ebe89..88d76c3e 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -104,7 +104,21 @@
         sortable />
       <el-table-column :label="t('ProductionPlan.Plan.tableFinishNumberColumn')" align="center" prop="wangongNumber"
         sortable />
-      <el-table-column :label="t('ProductionPlan.Plan.tablePassRateColumn')" align="center" prop="passRate" sortable />
+      <el-table-column :label="t('ProductionPlan.Plan.tablePassRateColumn')" align="center" min-width="60px" sortable="custom">
+        <template #default="scope">
+          <div class="pass-rate-cell">
+            <el-progress
+              type="circle"
+              :percentage="Number(scope.row.passRate ?? 0)"
+              :width="40"
+              :stroke-width="4"
+              :show-text="false"
+              :color="Number(scope.row.passRate ?? 0) === 100 ? '#67c23a' : undefined"
+            />
+            <span class="pass-rate-text">{{ Number(scope.row.passRate ?? 0) }}%</span>
+          </div>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="热压数量" align="center" prop="reyaNumber" /> -->
       <el-table-column :label="t('ProductionPlan.Plan.tableStatusColumn')" align="center" prop="status" sortable>
         <template #default="scope">
@@ -543,3 +557,23 @@ const handleTabClick = (tab: TabsPaneContext) => {
   handleQuery()
 }
 </script>
+
+<style scoped>
+.pass-rate-cell {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+}
+
+.pass-rate-cell :deep(.el-progress-circle) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.pass-rate-text {
+  font-size: 12px;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/mes/productionReport/index.vue b/src/views/mes/productionReport/index.vue
index 8d4efa6e..c1618589 100644
--- a/src/views/mes/productionReport/index.vue
+++ b/src/views/mes/productionReport/index.vue
@@ -123,8 +123,10 @@
                 :percentage="getProductionProgressPercent(scope.row)"
                 :width="40"
                 :stroke-width="4"
+                :show-text="false"
                 :color="getProductionProgressPercent(scope.row) === 100 ? '#67c23a' : undefined"
               />
+              <span class="production-progress-text">{{ getProductionProgressPercent(scope.row) }}%</span>
           </div>
         </template>
       </el-table-column>
@@ -276,6 +278,7 @@ onMounted(() => {
   display: flex;
   align-items: center;
   justify-content: center;
+  gap: 4px;
 }
 
 .production-progress-cell :deep(.el-progress-circle) {
@@ -284,11 +287,8 @@ onMounted(() => {
   justify-content: center;
 }
 
-.production-progress-cell :deep(.el-progress__text) {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 10px !important;
-  min-width: auto !important;
+.production-progress-text {
+  font-size: 12px;
+  white-space: nowrap;
 }
 </style>
diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue
index 3460001f..f10eb885 100644
--- a/src/views/mes/tasksummary/index.vue
+++ b/src/views/mes/tasksummary/index.vue
@@ -93,8 +93,10 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" hi
                 :percentage="getProductionProgressPercent(scope.row)"
                 :width="40"
                 :stroke-width="4"
+                :show-text="false"
                 :color="getProductionProgressPercent(scope.row) === 100 ? '#67c23a' : undefined"
               />
+              <span class="production-progress-text">{{ getProductionProgressPercent(scope.row) }}%</span>
           </div>
         </template>
       </el-table-column>
@@ -273,6 +275,7 @@ const handleTabClick = (tab: TabsPaneContext) => {
   display: flex;
   align-items: center;
   justify-content: center;
+  gap: 4px;
 }
 
 .production-progress-cell :deep(.el-progress-circle) {
@@ -281,11 +284,8 @@ const handleTabClick = (tab: TabsPaneContext) => {
   justify-content: center;
 }
 
-.production-progress-cell :deep(.el-progress__text) {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 10px !important;
-  min-width: auto !important;
+.production-progress-text {
+  font-size: 12px;
+  white-space: nowrap;
 }
 </style>