From 06029b6bb387e0136fbfb87635ce16ec6e5b2552 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sun, 23 Aug 2026 23:02:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=86=E5=8C=85=20OSD=20=E5=AD=97?= =?UTF-8?q?=E5=B9=95=E6=B8=85=E5=B1=8F=E6=94=B9=E4=B8=BA=E6=8E=A8=E3=80=8C?= =?UTF-8?q?=E6=97=A0=E4=BB=BB=E5=8A=A1=E3=80=8D=E5=BE=85=E5=91=BD=E6=96=87?= =?UTF-8?q?=E5=AD=97=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=BC=80=E5=90=AF=E5=B9=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A8=E9=80=81=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/express/returnUnpackwork/index.vue | 31 ++++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/views/express/returnUnpackwork/index.vue b/src/views/express/returnUnpackwork/index.vue index 0c2ac491..3ecb18e5 100644 --- a/src/views/express/returnUnpackwork/index.vue +++ b/src/views/express/returnUnpackwork/index.vue @@ -850,15 +850,17 @@ function restoreCameraSelection() { // ==================== OSD 字幕推送 ==================== // 拆包扫码时把「单号 + 商品条码」通过 camera.setOsd 推送到已选摄像头,叠加到监控画面 const OSD_ENABLED_STORAGE_KEY = 'returnUnpackWork:osdEnabled' -const osdEnabled = ref(false) +const OSD_IDLE_TEXT = '无任务' +const osdEnabled = ref(true) const lastScannedBarcode = ref('') const osdPushing = ref(false) let lastOsdText: string | null = null +let osdNoCameraWarned = false -/** 当前应推送的字幕文本:单号:xxx(扫到商品条码后追加 商品条码:xxx) */ +/** 当前应推送的字幕文本:单号:xxx(扫到商品条码后追加 商品条码:xxx);无拆包时显示待命文字 */ function buildOsdText(): string { const waybill = String(createResult.value?.record?.waybill_code ?? waybillCode.value ?? '').trim() - if (!waybill) return '' + if (!waybill) return OSD_IDLE_TEXT return lastScannedBarcode.value ? `单号:${waybill} 商品条码:${lastScannedBarcode.value}` : `单号:${waybill}` @@ -868,10 +870,16 @@ function buildOsdText(): string { async function pushOsdText(text?: string, force = false) { if (!osdEnabled.value) return const cameras = selectedCameras.value - if (!cameras.length) return - const t = String(text ?? buildOsdText()).trim() - // 从未推过字幕时不主动推空文本(避免无意义请求) - if (t === '' && (lastOsdText == null || lastOsdText === '')) return + if (!cameras.length) { + if (!osdNoCameraWarned) { + osdNoCameraWarned = true + ElMessage.warning('未选择摄像头,字幕未推送(点「摄像头设置」勾选)') + } + return + } + // 空文本 → 直接推「无任务」待命文字覆盖旧字幕 + const raw = text != null ? String(text).trim() : buildOsdText() + const t = raw === '' ? OSD_IDLE_TEXT : raw if (!force && t === lastOsdText) return lastOsdText = t osdPushing.value = true @@ -880,7 +888,11 @@ async function pushOsdText(text?: string, force = false) { cameras.map((c) => setOsd({ id: c.id, text: t, x: -0.9, y: 0.8 })) ) const okCount = results.filter((r) => r.status === 'fulfilled' && isOk(r.value)).length - if (okCount === 0) lastOsdText = null + if (okCount === 0) { + lastOsdText = null + } else if (t) { + ElMessage.success(`字幕已推送:${t}`) + } } finally { osdPushing.value = false } @@ -1282,7 +1294,8 @@ function resetWorkState() { orderDetailData.value = null orderDetailItems.value = [] lastScannedBarcode.value = '' - void pushOsdText('') + // 删除/取消/提交/清除后直接推「无任务」待命文字 + void pushOsdText(OSD_IDLE_TEXT) focusTarget.value = 'waybill' }