后管(四面9分批次): 裸提示 92→0、裸 confirm 24→0 且逐处 await、失败态可见并真能重试
- ElMessage.error 全收进 showAdminFeedback(例外清单 CAP=0,唯一保留的裸调用是出口本体); window.confirm 24 处全部改成 await 的 openAdminConfirm(逐处核过所在函数本就 async, 不存在"点了确认不执行"的异步断层)。 - 新增 load-failure-model + LoadFailureBar:22/23 个取数页有失败态与真重试 (只有"知道了"清条不算过),例外仅登录页。 - DedupeRegistryPage / DuplicateCheckPage 补 onUnmounted,并加全树定时器/监听配对判据。 - 去重页那处"能点但后端 403":读侧认 wholeCompany、写侧只认 groupIds/userIds 的不对称 本轮没动后端(前端拿不到与写侧同集合的 groupIds,按它置灰会误伤同事名下真能改的行=静默删功能); 先修更实在的一半——403 的中文原因此前整段丢失,现在走统一文案到界面。 - 验收:node --test 1,818 例 0 红、npx vue-tsc --noEmit rc=0;5 支新判据 26 例。
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
* 数据源保持自家后端:/duplicate-check-console(指标/店铺/撞款全集/分组统计) + /duplicate-check-ledger(台账分页) + /duplicate-check-export(Excel)。
|
||||
* 分组归属来自「店铺管理」真实店铺分组,本页只读展示,仅用于分组撞款范围切换。
|
||||
*/
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import type { DuplicateItem, DuplicateOccurrence, DuplicateMetrics, DuplicateShop } from './duplicate-model.ts'
|
||||
@@ -414,6 +414,11 @@ function siteColor(code: string): string {
|
||||
// loadConsole 的重挑分支(groupStats 为空时不触发)里留着一个不属于本公司的 selectedGroup。
|
||||
watch(() => companyTab.activeId, () => { filter.shop = ''; filter.group = ''; selectedGroup.value = ''; scope.value = 'global'; void loadConsole(); void loadLedger(1) })
|
||||
|
||||
// 卸载时收掉 toast 的 2.4s 收尾定时器:否则离开本页后它还会去摸一个已经不存在的节点。
|
||||
onUnmounted(() => {
|
||||
window.clearTimeout(toastTimer)
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
loadConsole()
|
||||
// 台账 Tab 计数打开即显示:挂载时预取第一页拿 total(对齐 reference 渲染即见台账条数)。
|
||||
@@ -432,6 +437,7 @@ onMounted(() => {
|
||||
|
||||
<div v-if="loadError" class="load-banner">
|
||||
<span>{{ loadError }}</span>
|
||||
<button class="btn btn-ghost btn-sm" type="button" @click="loadConsole">重试</button>
|
||||
<button class="btn btn-ghost btn-sm" type="button" @click="loadError = ''">知道了</button>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -21,10 +21,13 @@ import { imageVideoDownloadFilename, videoKeysOf } from './image-video-view.ts'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const tasks = ref<ImageVideoRow[]>([])
|
||||
const totalTasks = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -122,13 +125,15 @@ function toFilter(): ImageVideoFilter {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchImageVideoTasks(toFilter(), page.value, pageSize.value, companyTab.requestCompanyId)
|
||||
tasks.value = result.items
|
||||
totalTasks.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '视频任务加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '视频任务加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -201,7 +206,7 @@ async function openDetail(task: ImageVideoRow) {
|
||||
try {
|
||||
detail.value = await fetchImageVideoTaskDetail(task.taskId)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '详情加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '详情加载失败', 'error')
|
||||
detailVisible.value = false
|
||||
} finally {
|
||||
detailLoading.value = false
|
||||
@@ -218,7 +223,7 @@ async function downloadVideo(task: ImageVideoRow, index: number, video: ImageVid
|
||||
} catch {
|
||||
// 打包失败降级:直接打开该视频地址以便下载。
|
||||
if (video.displayUrl) window.open(video.displayUrl, '_blank')
|
||||
else ElMessage.error('视频下载失败')
|
||||
else showAdminFeedback('视频下载失败', 'error')
|
||||
} finally {
|
||||
downloadingKey.value = ''
|
||||
}
|
||||
@@ -237,7 +242,7 @@ async function downloadBatch() {
|
||||
const note = errorCount ? `,${errorCount} 个失败` : ''
|
||||
ElMessage.success(`正在打包 ${fileCount ?? keys.length} 个视频${note}`)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '批量下载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '批量下载失败', 'error')
|
||||
} finally {
|
||||
downloading.value = false
|
||||
}
|
||||
@@ -269,7 +274,7 @@ async function openPermission() {
|
||||
permPage.value = 1
|
||||
permissionVisible.value = true
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '权限用户加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '权限用户加载失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -286,7 +291,7 @@ async function savePermission() {
|
||||
ElMessage.success('保存成功')
|
||||
permissionVisible.value = false
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
} finally {
|
||||
permissionSaving.value = false
|
||||
}
|
||||
@@ -328,6 +333,7 @@ onMounted(load)
|
||||
</section>
|
||||
|
||||
<section class="panel-box iv-panel">
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="iv-toolbar">
|
||||
<div class="iv-toolbar-main">
|
||||
<button v-if="session.isSuperAdmin" class="btn btn-secondary" type="button" @click="openPermission">权限配置</button>
|
||||
|
||||
@@ -27,10 +27,14 @@ import {
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const groups = ref<ShopDataTaskGroup[]>([])
|
||||
const totalShops = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -127,13 +131,15 @@ function toFilter(): ShopDataFilter {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchShopDataTaskList(toFilter(), page.value, pageSize.value, companyTab.requestCompanyId)
|
||||
groups.value = result.items
|
||||
totalShops.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '店铺数据记录加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '店铺数据记录加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -223,7 +229,7 @@ async function downloadRow(row: ShopDataResultRow) {
|
||||
downloadProgress.visible = false
|
||||
ElMessage.success('下载已开始')
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '下载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '下载失败', 'error')
|
||||
} finally {
|
||||
busyKey.value = ''
|
||||
}
|
||||
@@ -244,7 +250,7 @@ async function downloadBatch() {
|
||||
const note = zip.errorCount ? `,${zip.errorCount} 个失败(详见包内错误清单)` : ''
|
||||
ElMessage.success(`已下载 ${zip.fileCount ?? resultIds.length} 个文件${note}`)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '批量下载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '批量下载失败', 'error')
|
||||
} finally {
|
||||
busyKey.value = ''
|
||||
}
|
||||
@@ -252,14 +258,14 @@ async function downloadBatch() {
|
||||
|
||||
async function removeRowByRow(row: ShopDataResultRow) {
|
||||
// 管理端真删:删除该店这条店铺数据记录(累计档 + 文件 + 明细),前台任务记录仍保留但文件不可再下载
|
||||
if (!window.confirm(`确认删除店铺“${row.shopName}”这条店铺数据记录及其数据文件?此操作不可恢复。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确认删除店铺“${row.shopName}”这条店铺数据记录及其数据文件?此操作不可恢复。`, danger: true }))) return
|
||||
deletingKey.value = row.resultId
|
||||
try {
|
||||
await deleteShopDataResultHistory(row.resultId)
|
||||
ElMessage.success('删除成功')
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : `删除店铺“${row.shopName}”的记录失败`)
|
||||
showAdminFeedback(error instanceof Error ? error.message : `删除店铺“${row.shopName}”的记录失败`, 'error')
|
||||
} finally {
|
||||
deletingKey.value = ''
|
||||
}
|
||||
@@ -280,7 +286,7 @@ async function openPermission() {
|
||||
permPage.value = 1
|
||||
permissionVisible.value = true
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '权限用户加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '权限用户加载失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,7 +302,7 @@ async function savePermission() {
|
||||
ElMessage.success('保存成功')
|
||||
permissionVisible.value = false
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
} finally {
|
||||
permissionSaving.value = false
|
||||
}
|
||||
@@ -347,6 +353,7 @@ onMounted(load)
|
||||
</section>
|
||||
|
||||
<section class="panel-box">
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="sd-toolbar">
|
||||
<div class="sd-toolbar-main">
|
||||
<label class="sd-select-all">
|
||||
|
||||
Reference in New Issue
Block a user