处理后台管理系统、修复BUG、处理权限

2026-04-22 01:09:28 +08:00
parent d691e53886
commit 236b73755c
77 changed files with 5157 additions and 522 deletions
--- a/frontend-vue/src/pages/brand/components/BrandPriceTrackTab.vue
+++ b/frontend-vue/src/pages/brand/components/BrandPriceTrackTab.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
  <div class="page-shell module-page">
    <BrandTopBar active="pricing" />

@@ -262,6 +262,7 @@ import BrandTopBar from '@/pages/brand/components/BrandTopBar.vue'
 import { LISTING_FILTER_OPTIONS, type ListingFilterValue } from '@/pages/brand/components/listingFilters'
 import { expandBrandFolderRecursive } from '@/shared/api/brand'
 import { getPywebviewApi, type UploadedJavaFile } from '@/shared/bridges/pywebview'
+import { getTaskPollIntervalMs } from '@/shared/task-progress-config'
 import {
  addPriceTrackCandidate,
  completePriceTrackLoopChild,
@@ -989,6 +990,9 @@ async function waitForTaskTerminal(taskId: number) {
  while (true) {
    try {
      const batch = await getPriceTrackTaskProgressBatch([taskId])
+      if (transientErrorCount > 0) {
+        queuePushResult.value = `任务 ${taskId} 后端已恢复，继续等待执行结果...`
+      }
      transientErrorCount = 0
      if ((batch.missingTaskIds || []).includes(taskId)) {
        removePollingTask(taskId)
@@ -1055,69 +1059,81 @@ async function pushToPythonQueue() {
  }
  pushing.value = true
  queuePayloadText.value = ''
+  let successCount = 0
+  let failedCount = 0
  try {
    for (let index = 0; index < matchedRows.length; index += 1) {
      const row = matchedRows[index]
-      let attempt = 0
-      const taskVo = await (async () => {
-        while (true) {
-          try {
-            return await createPriceTrackTask({
-              userId: 0,
-              statusMode: statusModeEnabled.value,
-              asinMode: asinModeEnabled.value,
-              items: [row] as unknown as Record<string, unknown>[],
-              asinFiles: resolveAsinRequestPaths(),
-              countryCodes: [...orderedCountryCodes.value],
-            })
-          } catch (error) {
-            const message = (error instanceof Error ? error.message : String(error || '')).toLowerCase()
-            const transient = ['无法连接到后端服务', 'bad gateway', 'gateway timeout', 'network error', 'timeout', '502', '503', '504'].some((pattern) => message.includes(pattern.toLowerCase()))
-            attempt += 1
-            if (!transient || attempt >= 10) throw error
-            queuePushResult.value = `后端服务暂时不可用，正在重试创建任务（${attempt}/10）...`
-            await new Promise<void>((resolve) => { window.setTimeout(() => resolve(), getPollIntervalMs()) })
+      try {
+        let attempt = 0
+        const taskVo = await (async () => {
+          while (true) {
+            try {
+              return await createPriceTrackTask({
+                userId: 0,
+                statusMode: statusModeEnabled.value,
+                asinMode: asinModeEnabled.value,
+                items: [row] as unknown as Record<string, unknown>[],
+                asinFiles: resolveAsinRequestPaths(),
+                countryCodes: [...orderedCountryCodes.value],
+              })
+            } catch (error) {
+              const message = (error instanceof Error ? error.message : String(error || '')).toLowerCase()
+              const transient = ['无法连接到后端服务', 'bad gateway', 'gateway timeout', 'network error', 'timeout', '502', '503', '504'].some((pattern) => message.includes(pattern.toLowerCase()))
+              attempt += 1
+              if (!transient || attempt >= 10) throw error
+              queuePushResult.value = '后端服务暂时不可用，正在重试创建任务（' + attempt + '/10）...'
+              await new Promise<void>((resolve) => { window.setTimeout(() => resolve(), getPollIntervalMs()) })
+            }
          }
+        })()
+        taskSnapshots.value = {
+          ...taskSnapshots.value,
+          [taskVo.taskId]: {
+            task: { id: taskVo.taskId, status: 'RUNNING' },
+            items: taskVo.items,
+          },
        }
-      })()
-      taskSnapshots.value = {
-        ...taskSnapshots.value,
-        [taskVo.taskId]: {
-          task: { id: taskVo.taskId, status: 'RUNNING' },
-          items: taskVo.items,
-        },
+        taskDetails.value = {
+          ...taskDetails.value,
+          [taskVo.taskId]: 'RUNNING',
+        }
+        saveTaskSnapshotsToStorage()
+        saveTaskDetailsToStorage()
+        const queuePayload = buildQueuePayload(taskVo, row)
+        queuePayloadText.value = JSON.stringify(queuePayload, null, 2)
+        const pushResult = await api.enqueue_json(queuePayload)
+        if (!pushResult?.success) {
+          failedCount += 1
+          queuePushResult.value = '任务 ' + taskVo.taskId + ' 推送失败，已自动继续下一条：' + (pushResult?.error || '未知错误')
+          ElMessage.error(queuePushResult.value)
+          continue
+        }
+        addPollingTask(taskVo.taskId)
+        scheduleNextPoll(true)
+        removeMatchedRowsLocally([row])
+        queuePushResult.value = matchedRows.length > 1
+          ? '任务 ' + taskVo.taskId + ' 已入队，等待完成后继续下一条（' + (index + 1) + '/' + matchedRows.length + '）'
+          : '任务 ' + taskVo.taskId + ' 已入队，等待执行完成'
+        const finalStatus = await waitForTaskTerminal(taskVo.taskId)
+        if (finalStatus !== 'SUCCESS') {
+          failedCount += 1
+          queuePushResult.value = '任务 ' + taskVo.taskId + ' 执行失败，已自动继续下一条（' + (index + 1) + '/' + matchedRows.length + '）'
+          ElMessage.error(queuePushResult.value)
+          continue
+        }
+        successCount += 1
+        queuePushResult.value = index + 1 < matchedRows.length
+          ? '任务 ' + taskVo.taskId + ' 已完成，继续推送下一条（' + (index + 1) + '/' + matchedRows.length + '）'
+          : '任务 ' + taskVo.taskId + ' 已完成'
+      } catch (error) {
+        failedCount += 1
+        queuePushResult.value = '第 ' + (index + 1) + '/' + matchedRows.length + ' 条任务处理失败，已自动继续下一条：' + (error instanceof Error ? error.message : '未知错误')
+        ElMessage.error(queuePushResult.value)
+        continue
      }
-      taskDetails.value = {
-        ...taskDetails.value,
-        [taskVo.taskId]: 'RUNNING',
-      }
-      saveTaskSnapshotsToStorage()
-      saveTaskDetailsToStorage()
-
-      const queuePayload = buildQueuePayload(taskVo, row)
-      queuePayloadText.value = JSON.stringify(queuePayload, null, 2)
-      const pushResult = await api.enqueue_json(queuePayload)
-      if (!pushResult?.success) {
-        throw new Error(pushResult?.error || `任务 ${taskVo.taskId} 推送失败`)
-      }
-
-      addPollingTask(taskVo.taskId)
-      scheduleNextPoll(true)
-      removeMatchedRowsLocally([row])
-      queuePushResult.value = matchedRows.length > 1
-        ? `任务 ${taskVo.taskId} 已入队，等待完成后继续下一条（${index + 1}/${matchedRows.length}）`
-        : `任务 ${taskVo.taskId} 已入队，等待执行完成`
-
-      const finalStatus = await waitForTaskTerminal(taskVo.taskId)
-      if (finalStatus !== 'SUCCESS') {
-        throw new Error(`任务 ${taskVo.taskId} 执行失败，已停止后续任务`)
-      }
-
-      queuePushResult.value = index + 1 < matchedRows.length
-        ? `任务 ${taskVo.taskId} 已完成，继续推送下一条（${index + 1}/${matchedRows.length}）`
-        : `任务 ${taskVo.taskId} 已完成`
    }
-    ElMessage.success(`已串行完成 ${matchedRows.length} 条店铺任务推送`)
+    ElMessage.success('店铺任务推送已完成：成功 ' + successCount + ' 条，失败 ' + failedCount + ' 条')
  } catch (e) {
    queuePushResult.value = e instanceof Error ? e.message : '推送异常'
    ElMessage.error(queuePushResult.value)
@@ -1353,7 +1369,7 @@ async function pushToPythonLoopQueue() {
 }

 function getPollIntervalMs() {
-  return document.visibilityState === 'visible' ? 6000 : 20000
+  return getTaskPollIntervalMs()
 }

 async function refreshTaskBatch() {
@@ -2248,3 +2264,4 @@ onUnmounted(() => {
  }
 }
 </style>
+