refactor(Scheduler): 重构调度台界面和逻辑

This commit is contained in:
2025-08-15 16:08:56 +08:00
parent bf9b911cb2
commit a646578128

View File

@@ -42,7 +42,8 @@
</div>
<div v-else class="task-panels">
<a-collapse v-model:activeKey="currentTab.activeTaskPanels">
<a-collapse v-model:activeKey="currentTab.activeTaskPanels"
:key="`collapse-${currentTab.key}-${currentTab.runningTasks.length}`">
<a-collapse-panel v-for="task in currentTab.runningTasks" :key="task.websocketId"
:header="`任务: ${task.taskName}`" style="font-size: 16px; margin-left: 8px">
<template #extra>
@@ -447,7 +448,47 @@ const startQuickTask = async () => {
const selectedOption = taskOptions.value.find(option => option.value === quickTaskForm.taskId)
const taskName = selectedOption?.label || '未知任务'
// 创建任务并添加到当前调度台
// 检查是否已存在同名任务
const existingTaskIndex = currentTab.value.runningTasks.findIndex(t => t.taskName === taskName)
if (existingTaskIndex >= 0) {
// 如果存在同名任务,复用现有任务卡片
const existingTask = currentTab.value.runningTasks[existingTaskIndex]
// 关闭旧的WebSocket连接如果存在
if (existingTask.websocket) {
existingTask.websocket.close()
}
// 保存旧的 websocketId
const oldWebsocketId = existingTask.websocketId
// 更新任务信息
existingTask.websocketId = response.websocketId
existingTask.status = '连接中'
existingTask.websocket = null
existingTask.userQueue = []
// 添加分隔日志
existingTask.logs.push({
time: new Date().toLocaleTimeString(),
message: '========== 新任务开始 ==========',
type: 'info'
})
// 更新 activeTaskPanels 数组移除旧ID添加新ID
const oldPanelIndex = currentTab.value.activeTaskPanels.indexOf(oldWebsocketId)
if (oldPanelIndex >= 0) {
currentTab.value.activeTaskPanels.splice(oldPanelIndex, 1)
}
currentTab.value.activeTaskPanels.push(existingTask.websocketId)
// 连接新的WebSocket
connectWebSocket(existingTask)
message.success('任务启动成功')
} else {
// 如果不存在同名任务,创建新任务
const task: RunningTask = {
websocketId: response.websocketId,
taskName,
@@ -465,6 +506,7 @@ const startQuickTask = async () => {
connectWebSocket(task)
message.success('任务启动成功')
}
// 重置表单
quickTaskForm.taskId = null
@@ -705,7 +747,7 @@ const executeCompletionAction = (action: string) => {
}
}
// 添加任务日志
// 添加任务日志 - 使用 websocketId 而不是 task 对象
const addTaskLog = (
task: RunningTask,
message: string,
@@ -714,20 +756,30 @@ const addTaskLog = (
const now = new Date()
const time = now.toLocaleTimeString()
// 找到任务在当前调度台中的索引
const taskIndex = currentTab.value.runningTasks.findIndex(t => t.websocketId === task.websocketId)
// 在所有调度台中查找正确的任务
let foundTask = false
for (const tab of schedulerTabs.value) {
const taskIndex = tab.runningTasks.findIndex(t => t.websocketId === task.websocketId)
if (taskIndex >= 0) {
// 直接修改 reactive 数组中的任务对象
currentTab.value.runningTasks[taskIndex].logs.push({
tab.runningTasks[taskIndex].logs.push({
time,
message,
type,
})
// 更新任务状态(如果有变化)
if (currentTab.value.runningTasks[taskIndex].status !== task.status) {
currentTab.value.runningTasks[taskIndex].status = task.status
if (tab.runningTasks[taskIndex].status !== task.status) {
tab.runningTasks[taskIndex].status = task.status
}
foundTask = true
break
}
}
if (!foundTask) {
console.warn('未找到对应的任务来添加日志websocketId:', task.websocketId)
}
// 自动滚动到底部