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 /> - + + + @@ -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; } 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" /> + {{ getProductionProgressPercent(scope.row) }}% @@ -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; }