diff --git a/src/views/home/components/control-deck-new.vue b/src/views/home/components/control-deck-new.vue index 9234d50..5387471 100644 --- a/src/views/home/components/control-deck-new.vue +++ b/src/views/home/components/control-deck-new.vue @@ -75,24 +75,28 @@
- +
@@ -114,11 +122,13 @@ 缩放 { const res = await stopDeviceCameraZoomApi({ idx: 0, token: deviceToken.value, - puid: '201115200268437643', + puid: deviceInfo.value?.puId, }) isStopLeft.value = true diff --git a/src/views/home/components/control-deck.vue b/src/views/home/components/control-deck.vue index e8177b0..922bf33 100644 --- a/src/views/home/components/control-deck.vue +++ b/src/views/home/components/control-deck.vue @@ -74,24 +74,28 @@
缩放 { const res = await stopDeviceCameraZoomApi({ idx: 0, token: deviceToken.value, - puid: '201115200268437643', + puid: deviceInfo.value?.puId, }) isStopLeft.value = true diff --git a/src/views/home/components/modal-content/add-or-edit-marker-form.vue b/src/views/home/components/modal-content/add-or-edit-marker-form.vue index 1cab8d3..2d4d72f 100644 --- a/src/views/home/components/modal-content/add-or-edit-marker-form.vue +++ b/src/views/home/components/modal-content/add-or-edit-marker-form.vue @@ -318,8 +318,8 @@ const onHandleConfirm = () => { // 判断当前点位和机器人位置是否一致 if ( - Math.abs(Robot_x - markerParams.value.xCount) > 2 || - Math.abs(Robot_y - markerParams.value.yCount) > 2 + Math.abs(Robot_x - markerParams.value.xCount) > 50 || + Math.abs(Robot_y - markerParams.value.yCount) > 50 ) { const Position = { Robot_x: markerParams.value.xCount, diff --git a/src/views/home/components/modal-content/control-deck.vue b/src/views/home/components/modal-content/control-deck.vue index 865d89e..817e9cd 100644 --- a/src/views/home/components/modal-content/control-deck.vue +++ b/src/views/home/components/modal-content/control-deck.vue @@ -12,11 +12,13 @@ alt="" @mousedown="handleChangeCamera('up')" @mouseup="handleChangeCamera('stop')" + @click="handleChangeCamera('up')" /> @@ -24,6 +26,7 @@ class="arrow-bottom hand-direction" src="@/assets/home-imgs/control-2-arrow.png" alt="" + @click="handleChangeCamera('down')" @mousedown="handleChangeCamera('down')" @mouseup="handleChangeCamera('stop')" /> @@ -31,6 +34,7 @@ class="arrow-left hand-direction" src="@/assets/home-imgs/control-2-arrow.png" alt="" + @click="handleChangeCamera('left')" @mousedown="handleChangeCamera('left')" @mouseup="handleChangeCamera('stop')" /> @@ -50,12 +54,14 @@
缩放