diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts b/src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts index 1a46f2f..d5ae58c 100644 --- a/src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts +++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts @@ -58,7 +58,7 @@ export const columnsTy: BasicColumn[] = [ { title: '设备标识', align: "center", - dataIndex: 'deviceIndex' + dataIndex: 'sn' }, // { // title: '设备型号', diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue index 6cac502..1284886 100644 --- a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue +++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue @@ -13,7 +13,7 @@ - + diff --git a/src/views/iot/tplink/camera/components/CameraPreviewForm.vue b/src/views/iot/tplink/camera/components/CameraPreviewForm.vue index ff67911..c27932f 100644 --- a/src/views/iot/tplink/camera/components/CameraPreviewForm.vue +++ b/src/views/iot/tplink/camera/components/CameraPreviewForm.vue @@ -2,14 +2,14 @@ -
- + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
(''); -const width = ref('1300'); +const width = ref('1100'); const visible = ref(false); const showCamera = ref(false); const disableSubmit = ref(false); @@ -83,7 +108,7 @@ import { setImageSwitch, getMultitransUrl, getPreviewUrl, - testAudio + testAudio,motionCtrl } from "../camera.api"; const props = defineProps({ @@ -363,6 +388,34 @@ function recordingEnd() { }); } +/** + * 控制球机移动 + */ +function moveCtrl(direction, startOrNot, speed) { + if (!formData.deviceIndex) return; + + let params = { + "deviceIndex": formData.deviceIndex, + "direction": direction, + "startOrNot": startOrNot, + "speed": speed, + }; + motionCtrl(params); + + if (startOrNot === 1) { + const directions = { + 1: '上', + 3: '左', + 5: '右', + 7: '下', + 9: '缩小', + 10: '放大', + 11: '对焦' + }; + const action = startOrNot === 1 ? '开始' : '停止'; + } +} + /** * 销毁 */ @@ -478,4 +531,40 @@ defineExpose({ .hmxzImg:hover { background: url('../../../../../assets/iot/monitor_7_1.png') left/contain no-repeat; } + +.fxjImgUp{ + width:50px;height: 50px; + margin-right:10px;vertical-align: bottom; + cursor: pointer; + border-radius: 5px;transform: rotate(270deg); + background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat; +} +.fxjImgUp:hover{ + background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat; +} +.fxjImgLeft{ + width:50px;height: 50px;margin-right:10px;vertical-align: bottom;transform: rotate(180deg); + cursor: pointer; + background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat; +} +.fxjImgLeft:hover{ + background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat; +} +.fxjImgDown{ + width:50px;height: 50px;margin-right:10px;vertical-align: bottom;transform: rotate(90deg); + cursor: pointer; + background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat; +} +.fxjImgDown:hover{ + background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat; +} +.fxjImgRight{ + width:50px;height: 50px;margin-right:10px;vertical-align: bottom; + cursor: pointer; + background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat; +} +.fxjImgRight:hover{ + background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat; +} +