super/crawler-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成删除品牌

Browse Source
This commit is contained in:
super
2026-03-29 13:41:03 +08:00
parent 9e57fa5762
commit 3d39236b13
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/.env
View File

@@ -7,6 +7,7 @@ proxy_url=https://api.jikip.com/ip-get?num=1&minute=1&format=json&area=all&proto
proxy_mode=2 proxy_mode=2
client_name=NanriAI 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

BIN
app/__pycache__/config.cpython-312.pyc
View File

Binary file not shown.

4
app/config.py
View File

@@ -18,8 +18,8 @@ proxy_url = os.getenv("proxy_url")
proxy_mode = int(os.getenv("proxy_mode",1)) proxy_mode = int(os.getenv("proxy_mode",1))
client_name=os.getenv("client_name") + ".exe" 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" cache_path = "./user_data"

40
frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue
View File

@@ -111,20 +111,20 @@
<div v-if="item.platform" class="files">平台：{{ item.platform }}</div> <div v-if="item.platform" class="files">平台：{{ item.platform }}</div>
<div v-if="item.countryCount !== undefined && item.matched" class="files">国家数：{{ item.countryCount }}</div> <div v-if="item.countryCount !== undefined && item.matched" class="files">国家数：{{ item.countryCount }}</div>
<div v-if="item.totalRows !== undefined && item.matched" class="time">去重后 {{ item.totalRows }} 条</div> <div v-if="item.totalRows !== undefined && item.matched" class="time">去重后 {{ item.totalRows }} 条</div>
<div v-if="item.taskId && item.matched" class="delete-brand-progress-block"> <div v-if="shouldShowProgress(item)" class="delete-brand-progress-block">
<div class="delete-brand-progress-header"> <div class="delete-brand-progress-header">
<span>任务进度</span> <span>任务进度</span>
<span>{{ formatProgressPercent(item.taskId) }}%</span> <span>{{ formatProgressPercent(item.taskId!) }}%</span>
</div> </div>
<div class="delete-brand-progress-bar"> <div class="delete-brand-progress-bar">
<div class="delete-brand-progress-bar-fill" :style="{ width: `${formatProgressPercent(item.taskId)}%` }"></div> <div class="delete-brand-progress-bar-fill" :style="{ width: `${formatProgressPercent(item.taskId!)}%` }"></div>
</div> </div>
<div class="files delete-brand-progress">{{ formatProgress(item.taskId) }}</div> <div class="files delete-brand-progress">{{ formatProgress(item.taskId!) }}</div>
</div> </div>
<div v-if="item.previewRows?.length" class="files split-entry-list delete-brand-preview"> <div v-if="item.previewRows?.length" class="files split-entry-list delete-brand-preview">
{{ formatPreview(item.previewRows) }} {{ formatPreview(item.previewRows) }}
</div> </div>
<div v-if="item.error" class="files">错误信息：{{ item.error }}</div> <div v-if="getDisplayError(item)" class="files">错误信息：{{ getDisplayError(item) }}</div>
</div> </div>
<div class="task-right split-result-actions"> <div class="task-right split-result-actions">
@@ -175,20 +175,20 @@
<div v-if="item.platform" class="files">平台：{{ item.platform }}</div> <div v-if="item.platform" class="files">平台：{{ item.platform }}</div>
<div v-if="item.countryCount !== undefined && item.matched" class="files">国家数：{{ item.countryCount }}</div> <div v-if="item.countryCount !== undefined && item.matched" class="files">国家数：{{ item.countryCount }}</div>
<div v-if="item.totalRows !== undefined && item.matched" class="time">去重后 {{ item.totalRows }} 条</div> <div v-if="item.totalRows !== undefined && item.matched" class="time">去重后 {{ item.totalRows }} 条</div>
<div v-if="item.taskId && item.matched" class="delete-brand-progress-block"> <div v-if="shouldShowProgress(item)" class="delete-brand-progress-block">
<div class="delete-brand-progress-header"> <div class="delete-brand-progress-header">
<span>任务进度</span> <span>任务进度</span>
<span>{{ formatProgressPercent(item.taskId) }}%</span> <span>{{ formatProgressPercent(item.taskId!) }}%</span>
</div> </div>
<div class="delete-brand-progress-bar"> <div class="delete-brand-progress-bar">
<div class="delete-brand-progress-bar-fill" :style="{ width: `${formatProgressPercent(item.taskId)}%` }"></div> <div class="delete-brand-progress-bar-fill" :style="{ width: `${formatProgressPercent(item.taskId!)}%` }"></div>
</div> </div>
<div class="files delete-brand-progress">{{ formatProgress(item.taskId) }}</div> <div class="files delete-brand-progress">{{ formatProgress(item.taskId!) }}</div>
</div> </div>
<div v-if="item.previewRows?.length" class="files split-entry-list delete-brand-preview"> <div v-if="item.previewRows?.length" class="files split-entry-list delete-brand-preview">
{{ formatPreview(item.previewRows) }} {{ formatPreview(item.previewRows) }}
</div> </div>
<div v-if="item.error" class="files">错误信息：{{ item.error }}</div> <div v-if="getDisplayError(item)" class="files">错误信息：{{ getDisplayError(item) }}</div>
</div> </div>
<div class="task-right split-result-actions"> <div class="task-right split-result-actions">
@@ -239,7 +239,6 @@ import { expandBrandFolderRecursive, type BrandExpandFolderItem } from '@/shared
import { import {
deleteDeleteBrandHistory, deleteDeleteBrandHistory,
getDeleteBrandHistory, getDeleteBrandHistory,
getDeleteBrandTaskDetail,
getDeleteBrandTaskDetails, getDeleteBrandTaskDetails,
getDeleteBrandTaskDownloadUrl, getDeleteBrandTaskDownloadUrl,
runDeleteBrand, runDeleteBrand,
@@ -276,6 +275,25 @@ const historySectionItems = computed(() =>
) )
const hasVisibleItems = computed(() => currentSectionItems.value.length > 0 || historySectionItems.value.length > 0) 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[]) { function normalizeDeleteBrandItems(items: DeleteBrandResultItem[]) {
return items.map((item) => { return items.map((item) => {
if (item.matched === false) { if (item.matched === false) {