diff --git a/frontend/src/views/TaskHall.vue b/frontend/src/views/TaskHall.vue index 0ae6a5d..81dc767 100644 --- a/frontend/src/views/TaskHall.vue +++ b/frontend/src/views/TaskHall.vue @@ -2710,6 +2710,16 @@ const formatEstimatedTime = (hours: number | undefined) => { const days = Math.floor(hours / WORK_HOURS_PER_DAY) const remainingHours = Math.round((hours % WORK_HOURS_PER_DAY) * 100) / 100 + if (days === 0) { + return Number.isInteger(remainingHours) ? `${remainingHours}小时` : `${remainingHours.toFixed(1)}小时` + } else if (remainingHours === 0) { + return `${days}天` + } else { + const hourStr = Number.isInteger(remainingHours) ? `${remainingHours}小时` : `${remainingHours.toFixed(1)}小时` + return `${days}天${hourStr}` + } +} + // 子任务时间线辅助函数 const getSubTaskStatusClass = (status: string | undefined) => { switch (status) { @@ -2742,17 +2752,6 @@ const hasInProgressSubTask = (task: any) => { return (task.subTaskInProgress || 0) > 0 } - - if (days === 0) { - return Number.isInteger(remainingHours) ? `${remainingHours}小时` : `${remainingHours.toFixed(1)}小时` - } else if (remainingHours === 0) { - return `${days}天` - } else { - const hourStr = Number.isInteger(remainingHours) ? `${remainingHours}小时` : `${remainingHours.toFixed(1)}小时` - return `${days}天${hourStr}` - } -} - /** * 获取任务流程阶段 * @param task 任务对象