From 0bd4843b8e1fe895d77c4a80ddd63a8bc5ed1e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com>
Date: Mon, 7 Sep 2026 15:53:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E5=BA=97=E9=93=BA=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E8=AE=B0=E5=BD=95=E5=8D=A1=E7=89=87=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA=20taskId(file=5Ftask.id=20=E7=9F=AD?=
=?UTF-8?q?=E6=95=B0=E5=AD=97=2027172=20=E7=B1=BB)=E2=80=94=E2=80=94?=
=?UTF-8?q?=E4=B8=8A=E4=B8=80=E6=8F=90=E4=BA=A4=E5=9B=9E=E9=80=80=E6=96=B9?=
=?UTF-8?q?=E5=90=91=E5=8F=8D=E4=BA=86,=E6=9F=A5=E5=BA=93=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=20taskNo=20=E5=AE=9E=E4=B8=BA=20SHOP=5FDATA=5FCRAWL-?=
=?UTF-8?q?=E9=9B=AA=E8=8A=B1ID=20=E8=B6=85=E9=95=BF=E4=B8=B2,=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E8=A6=81=E7=9A=84=E6=98=AF=E7=9F=AD=E6=95=B0=E5=AD=97?=
=?UTF-8?q?=20id;=E4=BF=9D=E7=95=99=E4=BB=BB=E5=8A=A1=E5=8F=B7=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E4=BF=AE=E5=A4=8D(12px+=E7=9C=81=E7=95=A5=E5=8F=B7?=
=?UTF-8?q?=E6=94=B6=E7=BC=A9,=E7=8A=B6=E6=80=81=E5=BE=BD=E7=AB=A0?=
=?UTF-8?q?=E4=B8=8D=E8=A2=AB=E6=8C=A1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin-frontend-vue/src/pages/tasks/ShopDataTasksPage.vue | 6 +++---
admin-frontend-vue/tests/align-shop-data-cards.test.ts | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin-frontend-vue/src/pages/tasks/ShopDataTasksPage.vue b/admin-frontend-vue/src/pages/tasks/ShopDataTasksPage.vue
index 4f76f716..a021bb63 100644
--- a/admin-frontend-vue/src/pages/tasks/ShopDataTasksPage.vue
+++ b/admin-frontend-vue/src/pages/tasks/ShopDataTasksPage.vue
@@ -217,14 +217,14 @@ async function downloadBatch() {
async function removeRowByRow(row: ShopDataResultRow) {
// 对齐旧版：原生 confirm。
- if (!window.confirm(`确认删除店铺“${row.shopName}”的任务 ${row.taskNo || row.resultId} 及结果文件？`)) return
+ if (!window.confirm(`确认删除店铺“${row.shopName}”的任务 ${row.taskId || row.taskNo || row.resultId} 及结果文件？`)) return
deletingKey.value = row.resultId
try {
await deleteShopDataResultHistory(row.resultId)
ElMessage.success('删除成功')
await load()
} catch (error) {
- ElMessage.error(error instanceof Error ? error.message : `正在删除任务 ${row.taskNo || row.resultId}...`)
+ ElMessage.error(error instanceof Error ? error.message : `正在删除任务 ${row.taskId || row.taskNo || row.resultId}...`)
} finally {
deletingKey.value = ''
}
@@ -335,7 +335,7 @@ onMounted(load)
- 任务 {{ row.taskNo || row.resultId }}
+ 任务 {{ row.taskId || row.taskNo || row.resultId }}
{{ statusLabel(row.status) }}
diff --git a/admin-frontend-vue/tests/align-shop-data-cards.test.ts b/admin-frontend-vue/tests/align-shop-data-cards.test.ts
index c0a43547..3fb83590 100644
--- a/admin-frontend-vue/tests/align-shop-data-cards.test.ts
+++ b/admin-frontend-vue/tests/align-shop-data-cards.test.ts
@@ -10,7 +10,7 @@ test('align_shop_data_cards_per_task', () => {
assert.match(page, /v-for="row in pagedResultRows"/, '逐任务卡片渲染')
assert.doesNotMatch(page, /v-for="group in groups"/, '去掉按店铺聚合卡片')
// 卡片结构：店铺名头 + 任务 id/状态 + 分组/最新/国家/文件 信息行 + 下载文件/删除。
- assert.match(page, /任务 {{ row\.taskNo \|\| row\.resultId }}/, '卡片显示任务号（taskNo 优先，短）')
+ assert.match(page, /任务 {{ row\.taskId \|\| row\.taskNo \|\| row\.resultId }}/, '卡片显示任务 id（file_task.id 短数字，与桌面端一致）')
assert.match(page, />分组最新国家