feat(波次拣货): 状态栏查询用时旁新增平均拣货/复核时长提示(剔除缺失与≤1分钟记录);UpperTable 增加 pagination-info-extra 可选插槽
This commit is contained in:
parent
5fffd8bb45
commit
1bae275cef
@ -196,6 +196,8 @@
|
||||
<div class="pagination-container" v-if="showPagination">
|
||||
<div class="pagination-info">
|
||||
已选 {{ selectedCount }} 条,查询用时 {{ (queryTime / 1000).toFixed(2) }} 秒
|
||||
<!-- 可选扩展插槽:紧随“查询用时”展示统计/通知(如平均拣货/复核时长),页面按需提供内容 -->
|
||||
<slot name="pagination-info-extra" />
|
||||
</div>
|
||||
<el-pagination
|
||||
:current-page="pagination.currentPage"
|
||||
|
||||
@ -57,6 +57,12 @@
|
||||
@refresh="loadData"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<template #pagination-info-extra>
|
||||
<span style="margin-left:16px;color:#606266;font-size:12px">
|
||||
平均拣货时长:{{ avgPickDurationText }} 平均复核时长:{{ avgReviewDurationText }}
|
||||
<span title="统计当前已加载任务:拣货/复核时间不超过1分钟或不完整(开始/完成时间缺失)的记录不计入平均">(不含≤1分钟与缺失)</span>
|
||||
</span>
|
||||
</template>
|
||||
<template #column-status="{ row }">
|
||||
<span :class="getStatusTextClass(getPickTaskStatusTagType(row.status))">
|
||||
{{ formatPickTaskStatus(row.status) }}
|
||||
@ -310,6 +316,17 @@ const cancelingTaskId = ref<number | string | null>(null)
|
||||
const batchCancelLoading = ref(false)
|
||||
const selectedTaskRows = ref<Array<Record<string, any>>>([])
|
||||
|
||||
/** 平均拣货时长文案(当前已加载行;剔除缺失与 <=1 分钟记录),无有效记录显示 — */
|
||||
const avgPickDurationText = computed(() => {
|
||||
const avg = calcAverageDurationSeconds(list.value.map((r) => r.pick_duration_sec as number | null | undefined))
|
||||
return avg === null ? '—' : formatSecondsHMS(Math.round(avg))
|
||||
})
|
||||
/** 平均复核时长文案(同规则) */
|
||||
const avgReviewDurationText = computed(() => {
|
||||
const avg = calcAverageDurationSeconds(list.value.map((r) => r.review_duration_sec as number | null | undefined))
|
||||
return avg === null ? '—' : formatSecondsHMS(Math.round(avg))
|
||||
})
|
||||
|
||||
const detailVisible = ref(true)
|
||||
const selectedTaskId = ref<number | string | null>(null)
|
||||
const detailActiveTab = ref('waveList')
|
||||
@ -550,14 +567,18 @@ function parseDateValue(value: unknown): Date | null {
|
||||
return null
|
||||
}
|
||||
|
||||
/** 时间差格式化为「时:分:秒」(HH:MM:SS 补零);起止缺失/解析失败/结束早于开始时返回 null */
|
||||
function calcDurationHMS(start: unknown, finish: unknown): string | null {
|
||||
/** 时间差秒数;起止缺失/解析失败/结束早于开始时返回 null */
|
||||
function calcDurationSeconds(start: unknown, finish: unknown): number | null {
|
||||
const startDate = parseDateValue(start)
|
||||
const finishDate = parseDateValue(finish)
|
||||
if (!startDate || !finishDate) return null
|
||||
const ms = finishDate.getTime() - startDate.getTime()
|
||||
if (!Number.isFinite(ms) || ms < 0) return null
|
||||
const totalSeconds = Math.floor(ms / 1000)
|
||||
return Math.floor(ms / 1000)
|
||||
}
|
||||
|
||||
/** 秒数格式化为「时:分:秒」(HH:MM:SS 补零) */
|
||||
function formatSecondsHMS(totalSeconds: number): string {
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
const h = Math.floor(totalSeconds / 3600)
|
||||
const m = Math.floor((totalSeconds % 3600) / 60)
|
||||
@ -565,6 +586,26 @@ function calcDurationHMS(start: unknown, finish: unknown): string | null {
|
||||
return `${pad(h)}:${pad(m)}:${pad(s)}`
|
||||
}
|
||||
|
||||
/** 时间差格式化为「时:分:秒」(HH:MM:SS 补零);起止缺失/解析失败/结束早于开始时返回 null */
|
||||
function calcDurationHMS(start: unknown, finish: unknown): string | null {
|
||||
const sec = calcDurationSeconds(start, finish)
|
||||
return sec === null ? null : formatSecondsHMS(sec)
|
||||
}
|
||||
|
||||
/** 平均时长(秒):剔除缺失与不超过 1 分钟(<=60s) 的记录;无有效记录返回 null */
|
||||
function calcAverageDurationSeconds(values: Array<number | null | undefined>): number | null {
|
||||
let sum = 0
|
||||
let count = 0
|
||||
for (const sec of values) {
|
||||
if (sec === null || sec === undefined) continue
|
||||
if (sec <= 60) continue
|
||||
sum += sec
|
||||
count += 1
|
||||
}
|
||||
if (!count) return null
|
||||
return sum / count
|
||||
}
|
||||
|
||||
function normalizePickTaskRow(row: WavePickTaskListItem) {
|
||||
return {
|
||||
...row,
|
||||
@ -599,8 +640,12 @@ function normalizePickTaskRow(row: WavePickTaskListItem) {
|
||||
update_time: row.update_time || '',
|
||||
/** 拣货用时 = 完成时间 - 开始时间(HH:MM:SS 补零);未完成/缺失时返回 null */
|
||||
pick_duration: calcDurationHMS(row.start_at || row.start_time, row.finish_at || row.finish_time),
|
||||
/** 拣货用时秒数(供平均统计) */
|
||||
pick_duration_sec: calcDurationSeconds(row.start_at || row.start_time, row.finish_at || row.finish_time),
|
||||
/** 复核用时 = 复核完成 - 复核开始(HH:MM:SS 补零);缺失/未复核完成时返回 null */
|
||||
review_duration: calcDurationHMS(row.review_start_time, row.review_finish_time)
|
||||
review_duration: calcDurationHMS(row.review_start_time, row.review_finish_time),
|
||||
/** 复核用时秒数(供平均统计) */
|
||||
review_duration_sec: calcDurationSeconds(row.review_start_time, row.review_finish_time)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user