修复工作台「合并输出预览」两格都不出画面
根因:CameraLayoutCanvas 里每格的帧写进了「本地对象」而不是 reactive 代理。 - state 先被 previews[cameraId] = state 挂上去,随后回调里又 state.src = url 再 current.src = url; 两者是同一个 target,Vue 的 setter 比较后发现值没变 → 不触发重渲染, 页面上的 <img src> 一直是空字符串(WS 帧其实一直在到,实测 5fps / 两路都有帧)。 改法: - 先 previews[cameraId] = state,再 const live = previews[cameraId](代理),帧只往 live.url / live.src 写; - 「无画面(摄像头可能离线)」占位改成 v-if="!previews[tile.cameraId]?.src",有画面时不再渲染。 验证(7301 + 本机软件 1.0.75,工作台「1号工作台」通道 34 / 45): - 两格 <img> 均为 blob: URL、naturalSize 1280×720,占位文字消失; - 同时用 node 直连 WS 复测:channel 34 / 45 均 40 帧 / 8 秒(5.1fps),确认设备侧正常。
This commit is contained in:
parent
f07e8da021
commit
424389a97a
@ -128,6 +128,7 @@ async function credentialOf(nvrId: number) {
|
|||||||
async function syncPreviews() {
|
async function syncPreviews() {
|
||||||
const wanted = new Set(tiles.slice(0, 4).map(tile => tile.cameraId));
|
const wanted = new Set(tiles.slice(0, 4).map(tile => tile.cameraId));
|
||||||
|
|
||||||
|
|
||||||
for (const key of Object.keys(previews)) {
|
for (const key of Object.keys(previews)) {
|
||||||
const cameraId = Number(key);
|
const cameraId = Number(key);
|
||||||
if (!wanted.has(cameraId)) await stopPreview(cameraId);
|
if (!wanted.has(cameraId)) await stopPreview(cameraId);
|
||||||
@ -162,24 +163,27 @@ async function syncPreviews() {
|
|||||||
url: '',
|
url: '',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 先挂进 previews,拿到 **reactive 代理**,后续帧只往代理上写。
|
||||||
|
// ⚠️ 别再写本地对象:同一个 url 先赋给本地 state.src 再赋给代理,Vue 的值比较
|
||||||
|
// 会判为“没变化”→ 不触发重渲染,画面就一直空白(踩过)。
|
||||||
|
previews[tile.cameraId] = state;
|
||||||
|
const live = previews[tile.cameraId];
|
||||||
|
|
||||||
state.stop = localWs.onFrame(info.sid, blob => {
|
state.stop = localWs.onFrame(info.sid, blob => {
|
||||||
const url = URL.createObjectURL(blob);
|
const url = URL.createObjectURL(blob);
|
||||||
const old = state.url;
|
const old = live.url;
|
||||||
state.url = url;
|
|
||||||
state.src = url;
|
|
||||||
|
|
||||||
const current = previews[tile.cameraId];
|
if (!previews[tile.cameraId]) {
|
||||||
// 该磁贴已经被删掉(改布局/切码流)→ 丢弃这帧,别写进已释放的对象
|
// 该磁贴已经被删掉(改布局/切码流)→ 丢弃这帧
|
||||||
if (!current) {
|
|
||||||
URL.revokeObjectURL(url);
|
URL.revokeObjectURL(url);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
current.src = url;
|
live.url = url;
|
||||||
|
live.src = url;
|
||||||
|
|
||||||
if (old) window.setTimeout(() => URL.revokeObjectURL(old), 1200);
|
if (old) window.setTimeout(() => URL.revokeObjectURL(old), 1200);
|
||||||
});
|
});
|
||||||
|
|
||||||
previews[tile.cameraId] = state;
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const message = err instanceof Error ? err.message : '预览失败';
|
const message = err instanceof Error ? err.message : '预览失败';
|
||||||
|
|
||||||
@ -363,7 +367,7 @@ const selected = computed(() => (selectedId.value ? tileById(selectedId.value) :
|
|||||||
}"
|
}"
|
||||||
@pointerdown="onPointerDown($event, tile)"
|
@pointerdown="onPointerDown($event, tile)"
|
||||||
>
|
>
|
||||||
<div class="tile-fallback">{{ tile.name }}<br /><small>无画面(摄像头可能离线)</small></div>
|
<div v-if="!previews[tile.cameraId]?.src" class="tile-fallback">{{ tile.name }}<br /><small>无画面(摄像头可能离线)</small></div>
|
||||||
<img
|
<img
|
||||||
v-if="previews[tile.cameraId]"
|
v-if="previews[tile.cameraId]"
|
||||||
:src="previews[tile.cameraId].src"
|
:src="previews[tile.cameraId].src"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user