diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue index d270a36b..a00f4674 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue @@ -7,51 +7,31 @@ -
- + + "> 雨刷: - - + +
摄相机参数 - + @@ -61,10 +41,7 @@ - + @@ -136,12 +113,12 @@ export default { enum: "DeviceTypeEnum", // gridColumn: 2, }, - { - label: "状态更新时间", - key: "updateTime", - // gridColumn: 2, - // enum: "CameraDirectionEnum" - }, + // { + // label: "状态更新时间", + // key: "updateTime", + // // gridColumn: 2, + // // enum: "CameraDirectionEnum" + // }, // { // label: '经/纬度', // key: "${longitude} / ${latitude}", @@ -164,7 +141,7 @@ export default { }, methods: { controlClick: throttle(function (type) { - controlCamera(this.deviceId, type); + controlCamera(this.dialogData.iotDeviceId, type, false); }, 150), visibleClose(bool) { if (bool) return; @@ -228,7 +205,7 @@ export default { align-items: center; justify-content: end; - > div { + >div { font-size: 16px; padding: 6px 12px; } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js index 736c5e7b..d0fdb2d9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js @@ -87,12 +87,12 @@ function padZero(num) { 99 /各⽅向动作停⽌/ * @returns */ -export function controlCamera(camId, cmdType) { +export function controlCamera(camId, cmdType, isMsgType = true) { return request({ url: "/video/PTZControl", method: "get", params: { - msgType: 3, + ...(isMsgType ? { msgType: 3 } : undefined), camId, cmdType, speed: 1,