From 171d7d331e7d13cfcc9c299dcdd5f04a2ea8e4d4 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 26 Aug 2025 09:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/control-deck-new.vue | 18 ++++++++++++++++--
 src/views/home/components/control-deck.vue     | 12 +++++++++++-
 .../modal-content/add-or-edit-marker-form.vue  |  4 ++--
 .../components/modal-content/control-deck.vue  | 10 ++++++++++
 4 files changed, 39 insertions(+), 5 deletions(-)

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 @@
                     <!-- 上下左右控制按钮 -->
                     <img
                         class="arrow-top hand-direction"
+                        @click="handleChangeCamera('up')"
                         @mousedown="handleChangeCamera('up')"
                         @mouseup="handleChangeCamera('stop')"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-right hand-direction"
+                        @click="handleChangeCamera('right')"
                         @mousedown="handleChangeCamera('right')"
                         @mouseup="handleChangeCamera('stop')"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-bottom hand-direction"
+                        @click="handleChangeCamera('down')"
                         @mousedown="handleChangeCamera('down')"
                         @mouseup="handleChangeCamera('stop')"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-left hand-direction"
+                        @click="handleChangeCamera('left')"
                         @mousedown="handleChangeCamera('left')"
                         @mouseup="handleChangeCamera('stop')"
                         src="@/assets/home-imgs/control-2-arrow.png"
@@ -100,7 +104,11 @@
 
                     <!-- 中间的按钮 -->
                     <div class="row-3-item-1-center">
-                        <img class="center-icon" :src="isStopLeft ? stopImg : startImg" />
+                        <img
+                            class="center-icon"
+                            @click="handleChangeCamera('stop')"
+                            :src="isStopLeft ? stopImg : startImg"
+                        />
                     </div>
 
                     <!-- 描述文字 -->
@@ -114,11 +122,13 @@
                         <span>缩放</span>
                         <img
                             style="margin-bottom: 2px"
+                            @click="handleChangeZoomCamera('ZoomIn')"
                             @mousedown="handleChangeZoomCamera('ZoomIn')"
                             @mouseup="handleStopDeviceCameraZoom()"
                             src="@/assets/home-imgs/control-2-add.png"
                         />
                         <img
+                            @click="handleChangeZoomCamera('ZoomOut')"
                             @mousedown="handleChangeZoomCamera('ZoomOut')"
                             @mouseup="handleStopDeviceCameraZoom()"
                             src="@/assets/home-imgs/control-2-reduce.png"
@@ -142,24 +152,28 @@
                     <!-- 上下左右控制按钮 -->
                     <img
                         class="arrow-top"
+                        @click="handleChangeRobot('5')"
                         @mousedown="handleChangeRobot('5')"
                         @mouseup="handleChangeRobot(9)"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-right"
+                        @click="handleChangeRobot('8')"
                         @mousedown="handleChangeRobot('8')"
                         @mouseup="handleChangeRobot(9)"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-bottom"
+                        @click="handleChangeRobot('6')"
                         @mousedown="handleChangeRobot('6')"
                         @mouseup="handleChangeRobot(9)"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-left"
+                        @click="handleChangeRobot('7')"
                         @mousedown="handleChangeRobot('7')"
                         @mouseup="handleChangeRobot(9)"
                         src="@/assets/home-imgs/control-2-arrow.png"
@@ -664,7 +678,7 @@ const handleStopDeviceCameraZoom = async () => {
     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 @@
                 <div class="row-3-item-1">
                     <!-- 上下左右控制按钮 -->
                     <img
+                        @click="handleChangeCamera('up')"
                         class="arrow-top hand-direction"
                         @mousedown="handleChangeCamera('up')"
                         @mouseup="handleChangeCamera('stop')"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
+                        @click="handleChangeCamera('right')"
                         class="arrow-right hand-direction"
                         @mousedown="handleChangeCamera('right')"
                         @mouseup="handleChangeCamera('stop')"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
+                        @click="handleChangeCamera('down')"
                         class="arrow-bottom hand-direction"
                         @mousedown="handleChangeCamera('down')"
                         @mouseup="handleChangeCamera('stop')"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
+                        @click="handleChangeCamera('left')"
                         class="arrow-left hand-direction"
                         @mousedown="handleChangeCamera('left')"
                         @mouseup="handleChangeCamera('stop')"
@@ -114,11 +118,13 @@
                         <span>缩放</span>
                         <img
                             style="margin-bottom: 2px"
+                            @click="handleChangeZoomCamera('ZoomIn')"
                             @mousedown="handleChangeZoomCamera('ZoomIn')"
                             @mouseup="handleStopDeviceCameraZoom()"
                             src="@/assets/home-imgs/control-2-add.png"
                         />
                         <img
+                            @click="handleChangeZoomCamera('ZoomOut')"
                             @mousedown="handleChangeZoomCamera('ZoomOut')"
                             @mouseup="handleStopDeviceCameraZoom()"
                             src="@/assets/home-imgs/control-2-reduce.png"
@@ -142,24 +148,28 @@
                     <!-- 上下左右控制按钮 -->
                     <img
                         class="arrow-top"
+                        @click="handleChangeRobot('5')"
                         @mousedown="handleChangeRobot('5')"
                         @mouseup="handleChangeRobot(9)"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-right"
+                        @click="handleChangeRobot('8')"
                         @mousedown="handleChangeRobot('8')"
                         @mouseup="handleChangeRobot(9)"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-bottom"
+                        @click="handleChangeRobot('6')"
                         @mousedown="handleChangeRobot('6')"
                         @mouseup="handleChangeRobot(9)"
                         src="@/assets/home-imgs/control-2-arrow.png"
                     />
                     <img
                         class="arrow-left"
+                        @click="handleChangeRobot('7')"
                         @mousedown="handleChangeRobot('7')"
                         @mouseup="handleChangeRobot(9)"
                         src="@/assets/home-imgs/control-2-arrow.png"
@@ -684,7 +694,7 @@ const handleStopDeviceCameraZoom = async () => {
     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')"
                     />
                     <img
                         class="arrow-right hand-direction"
                         src="@/assets/home-imgs/control-2-arrow.png"
                         alt=""
+                        @click="handleChangeCamera('right')"
                         @mousedown="handleChangeCamera('right')"
                         @mouseup="handleChangeCamera('stop')"
                     />
@@ -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 @@
                     <div class="add-reduce-btn">
                         <span>缩放</span>
                         <img
+                            @click="handleChangeZoomCamera('ZoomIn')"
                             style="margin-left: 20px; transform: rotate(-90deg)"
                             src="@/assets/home-imgs/control-2-add.png"
                             @mousedown="handleChangeZoomCamera('ZoomIn')"
                             @mouseup="handleStopDeviceCameraZoom()"
                         />
                         <img
+                            @click="handleChangeZoomCamera('ZoomOut')"
                             style="margin-left: 50px; transform: rotate(-90deg)"
                             src="@/assets/home-imgs/control-2-reduce.png"
                             @mousedown="handleChangeZoomCamera('ZoomOut')"
@@ -69,6 +75,7 @@
                 <div class="row-3-item-3">
                     <!-- 上下左右控制按钮 -->
                     <img
+                        @click="handleChangeRobot('5')"
                         @mousedown="handleChangeRobot('5')"
                         @mouseup="handleChangeRobot(9)"
                         class="arrow-top"
@@ -76,6 +83,7 @@
                         alt=""
                     />
                     <img
+                        @click="handleChangeRobot('8')"
                         @mousedown="handleChangeRobot('8')"
                         @mouseup="handleChangeRobot(9)"
                         class="arrow-right"
@@ -83,6 +91,7 @@
                         alt=""
                     />
                     <img
+                        @click="handleChangeRobot('6')"
                         @mousedown="handleChangeRobot('6')"
                         @mouseup="handleChangeRobot(9)"
                         class="arrow-bottom"
@@ -90,6 +99,7 @@
                         alt=""
                     />
                     <img
+                        @click="handleChangeRobot('7')"
                         @mousedown="handleChangeRobot('7')"
                         @mouseup="handleChangeRobot(9)"
                         class="arrow-left"