diff --git a/apps/web-antd/src/views/ops/work-order/data.ts b/apps/web-antd/src/views/ops/work-order/data.ts index a881f9b34..2b0004aeb 100644 --- a/apps/web-antd/src/views/ops/work-order/data.ts +++ b/apps/web-antd/src/views/ops/work-order/data.ts @@ -64,7 +64,7 @@ export const STATUS_TAB_OPTIONS = [ /** 优先级颜色映射(按数值直接映射,不依赖字典 colorType) */ const PRIORITY_STYLE_MAP: Record< number, - { style: { backgroundColor: string; color: string }; icon: string } + { icon: string; style: { backgroundColor: string; color: string } } > = { 0: { style: { backgroundColor: '#FFF0F0', color: '#C01D1D' }, diff --git a/apps/web-antd/src/views/ops/work-order/detail/index.vue b/apps/web-antd/src/views/ops/work-order/detail/index.vue index b798edd46..82c40d7ea 100644 --- a/apps/web-antd/src/views/ops/work-order/detail/index.vue +++ b/apps/web-antd/src/views/ops/work-order/detail/index.vue @@ -350,7 +350,7 @@ const isCancelled = computed(() => order.value.status === 'CANCELLED'); const isCurrentActive = computed( () => !isCancelled.value && - !['COMPLETED', 'CANCELLED'].includes(order.value.status), + !['CANCELLED', 'COMPLETED'].includes(order.value.status), ); /** 根据 step.key 查找 timeline 中对应的时间 */ @@ -381,7 +381,7 @@ const visibleSteps = computed(() => { title: t.status === 'CANCELLED' ? '已取消' - : (step?.title || t.statusName || t.status), + : step?.title || t.statusName || t.status, icon: step?.icon || 'solar:close-circle-bold-duotone', desc: t.description || step?.desc || '', }; @@ -861,20 +861,15 @@ onUnmounted(stopPolling); :key="step.key" class="progress-node" :class="{ - 'node-completed': - !isCancelled && index < currentStepIndex, - 'node-current': - isCurrentActive && index === currentStepIndex, + 'node-completed': !isCancelled && index < currentStepIndex, + 'node-current': isCurrentActive && index === currentStepIndex, 'node-completed-current': !isCancelled && index === currentStepIndex && order.status === 'COMPLETED', - 'node-pending': - !isCancelled && index > currentStepIndex, - 'node-cancelled-done': - isCancelled && index < currentStepIndex, - 'node-cancelled-end': - isCancelled && index === currentStepIndex, + 'node-pending': !isCancelled && index > currentStepIndex, + 'node-cancelled-done': isCancelled && index < currentStepIndex, + 'node-cancelled-end': isCancelled && index === currentStepIndex, }" > @@ -1874,7 +1869,6 @@ onUnmounted(stopPolling); .desc-text { color: rgb(255 255 255 / 75%); } - } /* ========== 通用卡片样式 ========== */