feat(前端): 10 个工具页删除任务补二次确认;外观专利上传时拦截分组塌陷

删除走服务端物理删除——任务记录连同 MinIO 上的结果文件一并回收,此前除品牌档案外
11 个工具页都是点击即发车,一次误点就没了。统一抽到 shared/task-delete-confirm.ts,
只在各页 deleteTaskRecord 开头插一行守卫(纯新增,未改各页原有删除逻辑)。

外观专利另加一道上传前拦截:本模块按 id 列分组、同组只检测 1 次把结论复制到组内其它行,
生产任务 28805 的源表 id 列 904 行全填 "1",整表塌成 1 组、105 秒就"完成"了。
解析后按 分组数/行数 比例提醒(行数 <20 或分组数正常时不打扰),用户可选返回改表。
This commit is contained in:
2026-09-27 11:27:45 +08:00
parent f0530a50db
commit 59a991880d
11 changed files with 90 additions and 1 deletions
@@ -75,7 +75,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import ModuleTemplateDownload from '@/shared/components/ModuleTemplateDownload.vue'
import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue'
@@ -115,6 +115,7 @@ import { uploadPathsToJava } from '@/shared/utils/upload-to-java'
import { runBatchDelete } from '@/shared/utils/batch-delete'
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
const selectedFileNames = ref<string[]>([])
const uploadedFiles = ref<UploadFileVo[]>([])
@@ -355,6 +356,30 @@ async function selectFolder() {
}
}
/**
* 本模块按 id 列分组,同组只检测 1 次并把结论复制给组内其它行。
* 生产事故(任务 28805):源表 id 列 904 行全填 "1",整表塌成 1 组,105 秒就"完成"了。
* 这里在解析后按组/行比例提醒用户确认,返回 true 表示用户选择回去改表。
*/
async function abortOnCollapsedGroups(res: { acceptedRows?: number; groupCount?: number }): Promise<boolean> {
const rows = res.acceptedRows || 0
const groups = res.groupCount || 0
if (rows < 20 || groups * 3 >= rows) {
return false
}
try {
await ElMessageBox.confirm(
`本次共 ${rows} 行,只识别出 ${groups} 个检测分组(平均每组 ${(rows / Math.max(groups, 1)).toFixed(1)} 行)。`
+ '同组只会检测 1 次,结论复制到组内其它行。若 id 列是整表同一个值,请改为每个商品一个 id 后重新上传。',
'分组数异常',
{ confirmButtonText: '按当前分组继续', cancelButtonText: '返回改表', type: 'warning', distinguishCancelAndClose: true },
)
return false
} catch {
return true
}
}
async function parseFiles() {
if (!uploadedFiles.value.length) {
ElMessage.warning('请先选择 Excel')
@@ -383,6 +408,13 @@ async function parseFiles() {
queuePayloadText.value = ''
return
}
if (await abortOnCollapsedGroups(res)) {
parseResult.value = null
queuedTaskSummary.value = null
queuePayloadText.value = ''
ElMessage.info('已取消,修正 id 列后重新解析')
return
}
parseResult.value = res
queuedTaskSummary.value = null
queuePayloadText.value = ''
@@ -911,6 +943,7 @@ async function downloadResult(item: AppearancePatentHistoryItem) {
}
async function deleteTaskRecord(item: AppearancePatentHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
try {
if (item.taskStatus === 'RUNNING' && item.taskId) {
await deleteAppearancePatentTask(item.taskId)
@@ -183,6 +183,7 @@ import { getPollingProgressBatch } from '@/shared/api/task-progress-polling.ts'
import { formatDateTime } from '@/shared/utils/datetime'
import { uploadPathsToJava } from '@/shared/utils/upload-to-java'
import { runBatchDelete } from '@/shared/utils/batch-delete'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
const COUNTRY_OPTIONS = [
{ code: 'DE', label: '德国' },
@@ -681,6 +682,7 @@ async function loadHistory() {
}
async function deleteTaskRecord(item: CollectDataHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
try {
if (item.resultId) {
await deleteCollectDataHistory(item.resultId)
@@ -295,6 +295,7 @@ import { isRecordMissingError } from '@/shared/utils/task-queue-state.ts'
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm';
const MAX_TRANSIENT_ERRORS = 30;
/** 任务终态后等待结果文件(Java 侧异步生成)的最大轮次,12 × 10s ≈ 2 分钟 */
@@ -1258,6 +1259,7 @@ async function downloadResult(item: PatrolDeleteHistoryItem) {
}
async function deleteTaskRecord(item: PatrolDeleteHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
try {
if (item.taskId) {
await deletePatrolDeleteTask(item.taskId);
@@ -271,6 +271,7 @@ import { uploadPathsToJava } from '@/shared/utils/upload-to-java'
import { runBatchDelete } from '@/shared/utils/batch-delete'
import { isRecordMissingError } from '@/shared/utils/task-queue-state.ts'
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
const ziniaoVersion = useZiniaoVersion()
@@ -1676,6 +1677,7 @@ async function downloadResult(item: PriceTrackHistoryItem) {
}
async function deleteTaskRecord(item: PriceTrackHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
try {
if (item.resultId != null) {
await deletePriceTrackHistory(item.resultId)
@@ -187,6 +187,7 @@ import { runBatchDelete } from '@/shared/utils/batch-delete'
import { isRecordMissingError } from '@/shared/utils/task-queue-state.ts'
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
import { getPollingProgressBatch } from '@/shared/api/task-progress-polling.ts'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
const shopInput = ref('')
const candidates = ref<ProductRiskCandidateVo[]>([])
@@ -520,6 +521,7 @@ function syncPollingIdsWithHistory() {
}
async function deleteTaskRecord(item: ProductRiskHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
try {
if (item.resultId != null && item.resultId > 0) {
await deleteProductRiskHistory(item.resultId)
@@ -237,6 +237,7 @@ import { isRecordMissingError, parseTaskStartTimes, removeTaskStartTime, upsertT
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm';
const MAX_TRANSIENT_ERRORS = 30;
const ziniaoVersion = useZiniaoVersion();
@@ -1075,6 +1076,7 @@ async function downloadResult(item: QueryAsinHistoryItem) {
}
async function deleteTaskRecord(item: QueryAsinHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
try {
if (item.taskId) {
await deleteQueryAsinTask(item.taskId);
@@ -167,6 +167,7 @@ import { runBatchDelete } from '@/shared/utils/batch-delete'
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
const COUNTRY_OPTIONS = [
{ code: 'UK', label: '英国' },
@@ -587,6 +588,7 @@ async function downloadResult(item: ShopDataCrawlHistoryItem) {
else if (result.error && result.error !== '用户取消') ElMessage.error(result.error)
}
async function deleteTaskRecord(item: ShopDataCrawlHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
try {
if (!item.taskId && !item.resultId) {
historyItems.value = historyItems.value.filter((row) => row !== item)
@@ -132,6 +132,7 @@ import { saveUrlWithProgress } from '@/shared/utils/download-progress'
import { useZiniaoVersion } from '@/shared/utils/ziniao-version'
import { runBatchDelete } from '@/shared/utils/batch-delete'
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
const COUNTRY_OPTIONS = [{ code: 'DE', label: '德国' }, { code: 'UK', label: '英国' }, { code: 'FR', label: '法国' }, { code: 'IT', label: '意大利' }, { code: 'ES', label: '西班牙' }] as const
const shopInput = ref('')
@@ -536,6 +537,7 @@ function statusClass(item: ShopMatchHistoryItem) { const status = resolvedTaskSt
function canDownload(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); return !!item.resultId && (!!item.fileReady || !!item.downloadUrl) && (status === 'SUCCESS' || status === 'COMPLETED' || status === 'FAILED') }
async function downloadResult(item: ShopMatchHistoryItem) { if (!item.resultId) return; const url = getShopMatchResultDownloadUrl(item.resultId); const filename = item.outputFilename || `${item.shopName || 'result'}.xlsx`; const result = await saveUrlWithProgress(url, filename, `shop-match:${item.resultId}`); if (result.success) ElMessage.success(`已保存: ${result.path || filename}`); else if (result.error && result.error !== '用户取消') ElMessage.error(result.error) }
async function deleteTaskRecord(item: ShopMatchHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
const taskId = normalizeTaskId(item.taskId)
const resultId = Number(item.resultId || 0)
try {
@@ -153,6 +153,7 @@ import { passGuard } from '@/shared/dispatch-guard-ui'
import { formatDateTime } from '@/shared/utils/datetime'
import { uploadPathsToJava } from '@/shared/utils/upload-to-java'
import { runBatchDelete } from '@/shared/utils/batch-delete'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
const selectedFileNames = ref<string[]>([])
const uploadedFiles = ref<UploadFileVo[]>([])
@@ -1027,6 +1028,7 @@ async function downloadResult(item: SimilarAsinHistoryItem) {
}
async function deleteTaskRecord(item: SimilarAsinHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
try {
const status = normalizeTaskStatus(item)
const taskId = item.taskId
@@ -277,6 +277,7 @@ import { isRecordMissingError, parseTaskStartTimes, removeTaskStartTime, upsertT
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
const MAX_TRANSIENT_ERRORS = 30;
const ziniaoVersion = useZiniaoVersion();
@@ -1204,6 +1205,7 @@ async function downloadResult(item: WithdrawTaskGroupItem) {
}
async function deleteTaskRecord(item: WithdrawTaskGroupItem) {
if (!(await confirmTaskDeletion(item))) return
try {
if (item.taskId) {
await deleteWithdrawTask(item.taskId);
@@ -0,0 +1,38 @@
import { ElMessageBox } from 'element-plus'
/**
* 删除任务/历史记录的统一二次确认。
*
* 删除走的是服务端物理删除:任务记录连同 MinIO 上的结果文件一并回收,不可恢复。
* 此前 11 个工具页的「删除」按钮都是点击即发车,只有 BrandBrandTab 有确认,这里补齐口径。
*
* `target` 传整条记录(自动挑 taskId / resultId / id 展示)或直接传任务号。
*/
export async function confirmTaskDeletion(target?: unknown): Promise<boolean> {
const subject = describeTarget(target)
const head = subject ? `确认删除任务 ${subject}?` : '确认删除这条记录?'
try {
await ElMessageBox.confirm(`${head}任务记录与结果文件将一并删除,不可恢复。`, '删除任务', {
confirmButtonText: '删除',
cancelButtonText: '取消',
type: 'warning',
})
return true
} catch {
return false
}
}
function describeTarget(target?: unknown): string {
if (target === null || target === undefined) return ''
if (typeof target === 'object') {
const record = target as Record<string, unknown>
for (const key of ['taskId', 'resultId', 'id']) {
const value = record[key]
if (typeof value === 'number' && value > 0) return String(value)
if (typeof value === 'string' && value.trim()) return value.trim()
}
return ''
}
return String(target)
}