From 60318d9b07302f879ef135094d2f28342e750625 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 15 Sep 2026 21:08:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(camera):=20=E6=91=84=E5=83=8F=E5=A4=B4?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=BC=B9=E7=AA=97=E6=96=B0=E5=A2=9E=E4=BA=91?= =?UTF-8?q?=E5=8F=B0=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF(=E6=96=B9?= =?UTF-8?q?=E5=90=91/=E8=BD=AC=E9=80=9F/=E9=A2=84=E7=BD=AE=E7=82=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - src/api/camera: 新增 ptzControl / ptzStop / ptzPresetGoto / ptzPresetSet 及 PtzDirection、转速与预置点校验 - src/components/CameraPtzPanel: 8 方向按住转动(松手停止)、转速 1-7、预置点 1-8 快捷键与编号跳转/覆盖保存 - 防呆: 按下请求未返回时先记录、返回后补发 stop;window pointerup/pointercancel/blur 与卸载时兜底停止 - newcamara 预览弹窗接入云台面板 --- src/api/camera/camera.ts | 134 ++++++ src/components/CameraPtzPanel/index.vue | 435 ++++++++++++++++++ .../components/CameraPreviewDialog.vue | 4 + 3 files changed, 573 insertions(+) create mode 100644 src/components/CameraPtzPanel/index.vue diff --git a/src/api/camera/camera.ts b/src/api/camera/camera.ts index d9ca5a59..665575fd 100644 --- a/src/api/camera/camera.ts +++ b/src/api/camera/camera.ts @@ -128,3 +128,137 @@ export function del(data: { id: number }) { isSystemApi: true } as any) } + +/** 云台方向:8 个位置(大小写不敏感,服务端统一转小写校验) */ +export type PtzDirection = + | 'up' + | 'down' + | 'left' + | 'right' + | 'upleft' + | 'upright' + | 'downleft' + | 'downright' + +/** 云台转速默认值(可选 1-7 的整数) */ +export const PTZ_DEFAULT_SPEED = 4 + +/** 云台转速范围:1-7 的整数 */ +export function normalizePtzSpeed(speed?: number): number { + const n = Number(speed) + if (!Number.isFinite(n)) return PTZ_DEFAULT_SPEED + const int = Math.round(n) + if (int < 1) return 1 + if (int > 7) return 7 + return int +} + +/** 云台预置点范围:1-256 的整数 */ +export function normalizePtzPresetId(presetId: number): number { + const n = Number(presetId) + if (!Number.isFinite(n)) return 0 + const int = Math.round(n) + if (int < 1 || int > 256) return 0 + return int +} + +/** + * 云台方向控制(按下):按指定方向持续转动摄像头 + * 必须配对调用 ptzStop 停止 + */ +export function ptzControl(data: { + id: number + action: PtzDirection + speed?: number +}) { + const body: Record = { + id: Number(data.id), + action: String(data.action || '').toLowerCase() + } + if (data.speed !== undefined && data.speed !== null) { + body.speed = normalizePtzSpeed(data.speed) + } + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.ptzControl', + v, + timestamp: new Date().getTime() + }, + data: body, + isSystemApi: true + } as any) +} + +/** + * 云台停止(松手):停止转动 + * action 必须与按下时(ptzControl)一致 + */ +export function ptzStop(data: { + id: number + action: PtzDirection +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.ptzStop', + v, + timestamp: new Date().getTime() + }, + data: { + id: Number(data.id), + action: String(data.action || '').toLowerCase() + }, + isSystemApi: true + } as any) +} + +/** + * 云台预置点跳转:跳转到指定预置点 + * 一次调用即可,无需 ptzStop + */ +export function ptzPresetGoto(data: { + id: number + presetId: number +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.ptzPresetGoto', + v, + timestamp: new Date().getTime() + }, + data: { + id: Number(data.id), + presetId: normalizePtzPresetId(data.presetId) + }, + isSystemApi: true + } as any) +} + +/** + * 云台预置点设置:把摄像头当前机位保存为指定预置点 + * 一次调用即可;已存在的编号会被当前机位覆盖 + */ +export function ptzPresetSet(data: { + id: number + presetId: number +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.ptzPresetSet', + v, + timestamp: new Date().getTime() + }, + data: { + id: Number(data.id), + presetId: normalizePtzPresetId(data.presetId) + }, + isSystemApi: true + } as any) +} diff --git a/src/components/CameraPtzPanel/index.vue b/src/components/CameraPtzPanel/index.vue new file mode 100644 index 00000000..4fb01aba --- /dev/null +++ b/src/components/CameraPtzPanel/index.vue @@ -0,0 +1,435 @@ + + + + + diff --git a/src/views/video/newcamara/components/CameraPreviewDialog.vue b/src/views/video/newcamara/components/CameraPreviewDialog.vue index fa36115f..12f4111d 100644 --- a/src/views/video/newcamara/components/CameraPreviewDialog.vue +++ b/src/views/video/newcamara/components/CameraPreviewDialog.vue @@ -47,6 +47,9 @@ + + +