From e8f0dead9ef5acd698ca3309319b1e78f934ef45 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:41:17 +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=94=B9=E5=9B=9E=E7=9F=AD=E4=BB=BB=E5=8A=A1=E5=8F=B7?= =?UTF-8?q?(taskNo=E4=BC=98=E5=85=88,=E5=8F=8D=E9=A6=88taskId=E8=BF=87?= =?UTF-8?q?=E9=95=BF)=E2=80=94=E2=80=94=E5=90=8C=E6=AD=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=A1=AE=E8=AE=A4=EF=BC=9B=E4=BF=AE=E5=A4=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=B7=E6=A0=B7=E5=BC=8F=E7=B1=BB=E5=90=8D=E4=B8=8D?= =?UTF-8?q?=E5=8C=B9=E9=85=8D(=E6=A8=A1=E6=9D=BFshop-card-task-no/?= =?UTF-8?q?=E6=A0=B7=E5=BC=8Fsd-task-no)=E8=87=B4=E9=95=BF=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=B7=E5=B0=86'=E5=B7=B2=E5=AE=8C=E6=88=90'?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=BE=BD=E7=AB=A0=E6=8C=A4=E5=87=BA=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E8=A2=AB=E8=A3=81=E2=80=94=E2=80=94=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=B712px+flex=E6=94=B6=E7=BC=A9=E7=9C=81=E7=95=A5=E5=8F=B7?= =?UTF-8?q?,=E7=8A=B6=E6=80=81=E5=BE=BD=E7=AB=A0=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=8F=AF=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/tasks/ShopDataTasksPage.vue | 12 +++++++----- .../tests/align-shop-data-cards.test.ts | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/admin-frontend-vue/src/pages/tasks/ShopDataTasksPage.vue b/admin-frontend-vue/src/pages/tasks/ShopDataTasksPage.vue index 97733553..4f76f716 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.taskId || row.taskNo || row.resultId} 及结果文件?`)) return + if (!window.confirm(`确认删除店铺“${row.shopName}”的任务 ${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.taskId || row.taskNo || row.resultId}...`) + ElMessage.error(error instanceof Error ? error.message : `正在删除任务 ${row.taskNo || row.resultId}...`) } finally { deletingKey.value = '' } @@ -335,7 +335,7 @@ onMounted(load)
- 任务 {{ row.taskId || row.taskNo || row.resultId }} + 任务 {{ row.taskNo || row.resultId }} {{ statusLabel(row.status) }}
@@ -631,9 +631,11 @@ h3 { gap: 10px; padding: 10px 16px 0; } -.sd-task-no { +.shop-card-task-no { + flex: 1 1 auto; + min-width: 0; font-weight: 600; - font-size: 13px; + font-size: 12px; color: #24384d; overflow: hidden; text-overflow: ellipsis; 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 48df14ae..c0a43547 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\.taskId \|\| row\.taskNo \|\| row\.resultId }}/, '卡片含任务 id(桌面端 taskid)') + assert.match(page, /任务 {{ row\.taskNo \|\| row\.resultId }}/, '卡片显示任务号(taskNo 优先,短)') assert.match(page, />分组最新国家