diff --git a/app/.env b/app/.env index 0b38d5f..bda0ef7 100644 --- a/app/.env +++ b/app/.env @@ -7,6 +7,7 @@ proxy_url=https://api.jikip.com/ip-get?num=1&minute=1&format=json&area=all&proto proxy_mode=2 client_name=NanriAI -java_api_base=http://127.0.0.1:18080 +java_api_base=http://8.136.19.173:18080 +# java_api_base=http://127.0.0.1:18080 diff --git a/app/__pycache__/config.cpython-312.pyc b/app/__pycache__/config.cpython-312.pyc index db8fad9..419f847 100644 Binary files a/app/__pycache__/config.cpython-312.pyc and b/app/__pycache__/config.cpython-312.pyc differ diff --git a/app/config.py b/app/config.py index bfdfd2a..ce6fe05 100644 --- a/app/config.py +++ b/app/config.py @@ -18,8 +18,8 @@ proxy_url = os.getenv("proxy_url") proxy_mode = int(os.getenv("proxy_mode",1)) client_name=os.getenv("client_name") + ".exe" -JAVA_API_BASE = os.getenv("java_api_base", "http://127.0.0.1:18080") - +JAVA_API_BASE = os.getenv("java_api_base", "http://8.136.19.173:18080") +# JAVA_API_BASE = os.getenv("java_api_base", "http://127.0.0.1:18080") cache_path = "./user_data" diff --git a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue index 2169a15..207f579 100644 --- a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue @@ -111,20 +111,20 @@
平台:{{ item.platform }}
国家数:{{ item.countryCount }}
去重后 {{ item.totalRows }} 条
-
+
任务进度 - {{ formatProgressPercent(item.taskId) }}% + {{ formatProgressPercent(item.taskId!) }}%
-
+
-
{{ formatProgress(item.taskId) }}
+
{{ formatProgress(item.taskId!) }}
{{ formatPreview(item.previewRows) }}
-
错误信息:{{ item.error }}
+
错误信息:{{ getDisplayError(item) }}
@@ -175,20 +175,20 @@
平台:{{ item.platform }}
国家数:{{ item.countryCount }}
去重后 {{ item.totalRows }} 条
-
+
任务进度 - {{ formatProgressPercent(item.taskId) }}% + {{ formatProgressPercent(item.taskId!) }}%
-
+
-
{{ formatProgress(item.taskId) }}
+
{{ formatProgress(item.taskId!) }}
{{ formatPreview(item.previewRows) }}
-
错误信息:{{ item.error }}
+
错误信息:{{ getDisplayError(item) }}
@@ -239,7 +239,6 @@ import { expandBrandFolderRecursive, type BrandExpandFolderItem } from '@/shared import { deleteDeleteBrandHistory, getDeleteBrandHistory, - getDeleteBrandTaskDetail, getDeleteBrandTaskDetails, getDeleteBrandTaskDownloadUrl, runDeleteBrand, @@ -276,6 +275,25 @@ const historySectionItems = computed(() => ) const hasVisibleItems = computed(() => currentSectionItems.value.length > 0 || historySectionItems.value.length > 0) +function getTaskStatus(taskId?: number) { + if (!taskId) return '' + return taskDetails.value[taskId]?.task?.status || '' +} + +function getDisplayError(item: DeleteBrandResultItem) { + if (item.error) return item.error + const taskId = item.taskId + if (!taskId) return '' + return taskDetails.value[taskId]?.task?.errorMessage || '' +} + +function shouldShowProgress(item: DeleteBrandResultItem) { + const taskId = item.taskId + if (!taskId || item.matched !== true) return false + const status = getTaskStatus(taskId) + return status === 'RUNNING' +} + function normalizeDeleteBrandItems(items: DeleteBrandResultItem[]) { return items.map((item) => { if (item.matched === false) {