diff --git a/frontend/src/views/TaskHall.vue b/frontend/src/views/TaskHall.vue index d5401e9..ef44511 100644 --- a/frontend/src/views/TaskHall.vue +++ b/frontend/src/views/TaskHall.vue @@ -4082,21 +4082,25 @@ const loadInProgressTasks = async () => { console.log('子任务处理后,allTasks长度:', allTasks.length, 'totalCount:', totalCount) } - // 处理主任务(排除流水线任务,因为流水线任务由子任务显示) + // 处理主任务(对于流水线任务,如果主任务状态是in_progress也要显示) if (taskResponse.data && taskResponse.data.records) { console.log('getTasks返回的记录数:', taskResponse.data.records.length) - const normalTasks = taskResponse.data.records - .filter((task: any) => { - console.log('检查任务:', task.title, 'isPipeline:', task.isPipeline) - return task.isPipeline !== 1 - }) // 排除流水线任务 - .map((task: any) => ({ - ...task, - isSubTask: false - })) - console.log('过滤后的主任务数:', normalTasks.length) - allTasks = [...allTasks, ...normalTasks] - totalCount += normalTasks.length + const tasksWithInProgress = taskResponse.data.records.filter((task: any) => { + console.log('检查任务:', task.title, 'isPipeline:', task.isPipeline, 'status:', task.status) + // 对于流水线任务,如果主任务状态是in_progress,也要显示(因为可能有子任务在进行中) + if (task.isPipeline === 1) { + return task.status === 'in_progress' + } + // 非流水线任务,直接显示 + return true + }) + console.log('过滤后的主任务数:', tasksWithInProgress.length) + const mappedTasks = tasksWithInProgress.map((task: any) => ({ + ...task, + isSubTask: false + })) + allTasks = [...allTasks, ...mappedTasks] + totalCount += mappedTasks.length console.log('主任务处理后,allTasks长度:', allTasks.length, 'totalCount:', totalCount) } } else {