feat(brand): 品牌检测建单可选本机/线上采集(V212),默认本机+排队相位可见
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
<aside class="left-panel">
|
||||
<div class="section-title">待检品牌文件</div>
|
||||
<FileUploadZone
|
||||
hint="Excel 每行含「品牌」列即会加入检测。可多选文件或选择整个文件夹(.xlsx)。检测由本机客户端执行,请在桌面客户端中打开本页面。"
|
||||
hint="Excel 每行含「品牌」列即会加入检测。可多选文件或选择整个文件夹(.xlsx)。请在桌面客户端中打开本页面提交。"
|
||||
:names="selectedPaths"
|
||||
:max-display="8"
|
||||
:disabled="!hasBridge"
|
||||
@@ -30,6 +30,35 @@
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="section-title">本单采集方式</div>
|
||||
<div class="radio-cards">
|
||||
<label class="radio-card" :class="{ selected: collectChannel === 'LOCAL' }">
|
||||
<input
|
||||
type="radio"
|
||||
name="brand-channel"
|
||||
value="LOCAL"
|
||||
v-model="collectChannel"
|
||||
:disabled="channelLocked || !canRunLocal"
|
||||
/>
|
||||
<span class="radio-card-name">本机采集(推荐)</span>
|
||||
<span class="radio-card-desc">由本机客户端执行:用你自己的代理,不受服务端并发名额排队影响</span>
|
||||
</label>
|
||||
<label class="radio-card" :class="{ selected: collectChannel === 'ONLINE' }">
|
||||
<input
|
||||
type="radio"
|
||||
name="brand-channel"
|
||||
value="ONLINE"
|
||||
v-model="collectChannel"
|
||||
:disabled="channelLocked"
|
||||
/>
|
||||
<span class="radio-card-name">线上采集</span>
|
||||
<span class="radio-card-desc">由服务端执行:并发名额有限,前面有大单时会排队较久</span>
|
||||
</label>
|
||||
</div>
|
||||
<p v-if="!canRunLocal" class="env-tip">
|
||||
当前客户端版本不支持「本机采集」,请升级客户端;本次将走线上采集。
|
||||
</p>
|
||||
|
||||
<div class="section-title">运行方式</div>
|
||||
<p class="loading-msg">提交后立即开始检测,可在右侧任务列表查看进度或取消。</p>
|
||||
|
||||
@@ -110,15 +139,18 @@ import {
|
||||
getBrandTask,
|
||||
getBrandTaskDownloadUrl,
|
||||
getBrandTasks,
|
||||
runBrandLocal,
|
||||
runBrandNow,
|
||||
type BrandTaskItem,
|
||||
} from '@/shared/api/brand'
|
||||
import { getCollectRouting } from '@/shared/api/types/modules/collect-routing.ts'
|
||||
import { useExcelFileUpload } from '@/shared/composables/useExcelFileUpload'
|
||||
import { getTaskPollIntervalMs } from '@/shared/task-progress-config'
|
||||
import { createCategorizedTimers } from '@/shared/utils/categorized-timers'
|
||||
import type { UploadedFileRef } from '@/shared/api/types/upload.ts'
|
||||
import { formatDateTime } from '@/shared/utils/datetime'
|
||||
import { taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text'
|
||||
import { brandPhaseText } from '@/shared/utils/brand-phase'
|
||||
import { isHttpUrl, safeHttpUrl } from '@/shared/utils/safe-url'
|
||||
import { runBatchDelete } from '@/shared/utils/batch-delete'
|
||||
|
||||
@@ -157,6 +189,13 @@ const tasks = ref<BrandTaskItem[]>([])
|
||||
// 品牌检测已服务端化(/api/brand/* 走域名):浏览器降级桥提供文件选择,Web 端可用;
|
||||
// 文件夹选择/模板桥等降级桥未实现的方法在点击时提示"仅桌面端"
|
||||
const hasBridge = computed(() => Boolean(getPywebviewApi()))
|
||||
/**
|
||||
* 本机采集能力(V212):老客户端的 pywebview 桥没有 `run_brand_task`,此时本地选项置灰
|
||||
* 并要求升级——静默改走线上会让用户以为在本地跑,实则又进了服务端那 2 个名额的队列。
|
||||
*/
|
||||
const canRunLocal = computed(() => Boolean(getPywebviewApi()?.run_brand_task))
|
||||
const collectChannel = ref<'LOCAL' | 'ONLINE'>('ONLINE')
|
||||
const channelLocked = computed(() => submitting.value)
|
||||
const hasUid = computed(() => {
|
||||
const raw = typeof window === 'undefined' ? '' : window.localStorage.getItem('uid') || ''
|
||||
const numeric = Number(raw.trim())
|
||||
@@ -168,13 +207,6 @@ let pollTimer: number | null = null
|
||||
/** taskId -> 行级进度快照(按“已处理品牌行 / 总品牌行”推进,成功或查询失败都计入完成数) */
|
||||
const lineProgressMap = ref<Record<string, { current: number; total: number; phase?: string }>>({})
|
||||
|
||||
const BRAND_PHASE_TEXT: Record<string, string> = {
|
||||
crawling: '品牌查询中',
|
||||
assembling: '结果生成中',
|
||||
uploading: '结果上传中',
|
||||
failed: '处理失败',
|
||||
}
|
||||
|
||||
function hasBusyBrandTask() {
|
||||
return tasks.value.some(isBusyBrandTask)
|
||||
}
|
||||
@@ -346,7 +378,7 @@ function toBrandTaskView(item: BrandTaskItem): TaskItemView {
|
||||
if (lp && lineTotal > 0) {
|
||||
progress = {
|
||||
percent: Math.max(0, Math.min(100, Math.round((lineCurrent / lineTotal) * 100))),
|
||||
stage: (lp.phase && BRAND_PHASE_TEXT[lp.phase]) || '品牌检测中',
|
||||
stage: brandPhaseText(lp.phase),
|
||||
countLabel: `${lineCurrent}/${lineTotal}`,
|
||||
}
|
||||
} else {
|
||||
@@ -371,6 +403,15 @@ function toBrandTaskView(item: BrandTaskItem): TaskItemView {
|
||||
}
|
||||
}
|
||||
|
||||
/** 本机采集:把桥返回的驼峰形状收敛成与线上分支一致的 {success, task_id, error}。 */
|
||||
async function runBrandLocalTask(files: UploadedFileRef[]) {
|
||||
const res = await runBrandLocal(files, strategy.value, getPywebviewApi() ?? undefined)
|
||||
if (!res.available) {
|
||||
throw new Error('当前客户端版本不支持本机采集,请升级客户端后重试(也可先改用线上采集)')
|
||||
}
|
||||
return { success: res.success, task_id: res.taskId, error: res.error }
|
||||
}
|
||||
|
||||
async function submitRun() {
|
||||
if (!hasBridge.value) {
|
||||
ElMessage.warning('请在桌面客户端中打开本页面执行品牌检测')
|
||||
@@ -394,9 +435,11 @@ async function submitRun() {
|
||||
relativePath: f.relativePath,
|
||||
fileUrl: f.url || f.localPath,
|
||||
}))
|
||||
const res = await runBrandNow(files, strategy.value)
|
||||
const res = collectChannel.value === 'LOCAL'
|
||||
? await runBrandLocalTask(files)
|
||||
: await runBrandNow(files, strategy.value, 'ONLINE')
|
||||
if (res.success && res.task_id) {
|
||||
ElMessage.success(`已创建任务 ${res.task_id},开始检测`)
|
||||
ElMessage.success(`已创建任务 ${res.task_id}(${collectChannel.value === 'LOCAL' ? '本机采集' : '线上采集'}),开始检测`)
|
||||
} else {
|
||||
throw new Error((res as { error?: string }).error || '运行失败')
|
||||
}
|
||||
@@ -516,6 +559,15 @@ async function downloadTemplate(kind: 'xlsx' | 'zip') {
|
||||
|
||||
onMounted(() => {
|
||||
void syncTasksAndResumePolling()
|
||||
// 默认通道由服务端给(V212 起 BRAND 默认 LOCAL),前端不自己写死:
|
||||
// 老客户端没有 run_brand_task 桥时强制落到线上,并把本地选项置灰。
|
||||
void getCollectRouting()
|
||||
.then((routing) => {
|
||||
collectChannel.value = routing?.brandLocal && canRunLocal.value ? 'LOCAL' : 'ONLINE'
|
||||
})
|
||||
.catch(() => {
|
||||
collectChannel.value = 'ONLINE'
|
||||
})
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
|
||||
Reference in New Issue
Block a user