chore: adjust logs api loading

This commit is contained in:
engigu
2026-03-30 17:39:24 +08:00
parent 27e144410d
commit a0401b645e
2 changed files with 50 additions and 19 deletions
+26 -11
View File
@@ -59,8 +59,15 @@ const isWsLoading = ref(false)
let logSocket: WebSocket | null = null let logSocket: WebSocket | null = null
import { decompressFromBase64 } from '@/utils/decompress'
const decompressedOutput = computed(() => { const decompressedOutput = computed(() => {
return wsContent.value || '无输出' if (!wsContent.value) return '无输出'
// 检查是否是 base64 (尝试性,如果开头是 eJ 且长度较大,很可能是压缩后的)
if (wsContent.value.length > 20 && wsContent.value.startsWith('eJ')) {
return decompressFromBase64(wsContent.value)
}
return wsContent.value
}) })
async function loadLogs() { async function loadLogs() {
@@ -159,6 +166,18 @@ async function selectLog(log: TaskLog) {
wsContent.value = '' wsContent.value = ''
isWsLoading.value = true isWsLoading.value = true
if (log.status !== TASK_STATUS.RUNNING) {
try {
const res = await api.logs.get(log.id)
wsContent.value = res.output
} catch {
toast.error('加载详情失败')
} finally {
isWsLoading.value = false
}
return
}
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:' const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
const host = window.location.host const host = window.location.host
const baseUrl = (window as any).__BASE_URL__ || '' const baseUrl = (window as any).__BASE_URL__ || ''
@@ -174,16 +193,12 @@ async function selectLog(log: TaskLog) {
logSocket.onmessage = (event) => { logSocket.onmessage = (event) => {
isWsLoading.value = false isWsLoading.value = false
if (log.status !== TASK_STATUS.RUNNING) { wsContent.value += event.data
wsContent.value = event.data // 自动滚动到底部
} else { nextTick(() => {
wsContent.value += event.data const pre = document.querySelector('.log-pre')
// 自动滚动到底部 if (pre) pre.scrollTop = pre.scrollHeight
nextTick(() => { })
const pre = document.querySelector('.log-pre')
if (pre) pre.scrollTop = pre.scrollHeight
})
}
} }
logSocket.onerror = (e) => { logSocket.onerror = (e) => {
+24 -8
View File
@@ -14,7 +14,7 @@ import { api, type Agent, type Task } from '@/api'
import { toast } from 'vue-sonner' import { toast } from 'vue-sonner'
import { useSiteSettings } from '@/composables/useSiteSettings' import { useSiteSettings } from '@/composables/useSiteSettings'
import { useRouter, useRoute } from 'vue-router' import { useRouter, useRoute } from 'vue-router'
import { TASK_TYPE, AGENT_STATUS, TRIGGER_TYPE } from '@/constants' import { TASK_TYPE, AGENT_STATUS, TRIGGER_TYPE, TASK_STATUS } from '@/constants'
import TextOverflow from '@/components/TextOverflow.vue' import TextOverflow from '@/components/TextOverflow.vue'
const router = useRouter() const router = useRouter()
@@ -247,6 +247,16 @@ onUnmounted(() => {
cleanupLogSocket() cleanupLogSocket()
}) })
import { decompressFromBase64 } from '@/utils/decompress'
const displayLogContent = computed(() => {
if (!logContent.value) return '无输出'
if (latestLogStatus.value !== TASK_STATUS.RUNNING && logContent.value.length > 20 && logContent.value.startsWith('eJ')) {
return decompressFromBase64(logContent.value)
}
return logContent.value
})
async function viewLogs(taskId: string) { async function viewLogs(taskId: string) {
try { try {
const res = await api.logs.list({ task_id: taskId, page: 1, page_size: 1 }) const res = await api.logs.list({ task_id: taskId, page: 1, page_size: 1 })
@@ -259,7 +269,17 @@ async function viewLogs(taskId: string) {
logContent.value = '' logContent.value = ''
showLogViewer.value = true showLogViewer.value = true
// Connect WebSocket to load log content if (latestLog.status !== TASK_STATUS.RUNNING) {
try {
const detail = await api.logs.get(latestLog.id)
logContent.value = detail.output
} catch {
toast.error('加载日志详情失败')
}
return
}
// Connect WebSocket to load log content for running tasks
cleanupLogSocket() cleanupLogSocket()
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:' const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
const host = window.location.host const host = window.location.host
@@ -269,11 +289,7 @@ async function viewLogs(taskId: string) {
logSocket = new WebSocket(wsUrl) logSocket = new WebSocket(wsUrl)
logSocket.onmessage = (event) => { logSocket.onmessage = (event) => {
if (latestLog.status !== 'running') { logContent.value += event.data
logContent.value = event.data
} else {
logContent.value += event.data
}
} }
} else { } else {
toast.info('该任务暂无执行日志') toast.info('该任务暂无执行日志')
@@ -511,7 +527,7 @@ watch(() => route.query.agent_id, (newVal) => {
<!-- 最新日志全屏查看 --> <!-- 最新日志全屏查看 -->
<LogViewer v-model:open="showLogViewer" :title="`最新日志 - ${latestLogTitle}`" <LogViewer v-model:open="showLogViewer" :title="`最新日志 - ${latestLogTitle}`"
:content="logContent || '无输出'" :status="latestLogStatus" /> :content="displayLogContent || '无输出'" :status="latestLogStatus" />
<!-- 删除确认 (批量) --> <!-- 删除确认 (批量) -->
<AlertDialog v-model:open="showBatchDeleteDialog"> <AlertDialog v-model:open="showBatchDeleteDialog">