This commit is contained in:
parent
1415388ac1
commit
171d7d331e
|
|
@ -75,24 +75,28 @@
|
||||||
<!-- 上下左右控制按钮 -->
|
<!-- 上下左右控制按钮 -->
|
||||||
<img
|
<img
|
||||||
class="arrow-top hand-direction"
|
class="arrow-top hand-direction"
|
||||||
|
@click="handleChangeCamera('up')"
|
||||||
@mousedown="handleChangeCamera('up')"
|
@mousedown="handleChangeCamera('up')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-right hand-direction"
|
class="arrow-right hand-direction"
|
||||||
|
@click="handleChangeCamera('right')"
|
||||||
@mousedown="handleChangeCamera('right')"
|
@mousedown="handleChangeCamera('right')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-bottom hand-direction"
|
class="arrow-bottom hand-direction"
|
||||||
|
@click="handleChangeCamera('down')"
|
||||||
@mousedown="handleChangeCamera('down')"
|
@mousedown="handleChangeCamera('down')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-left hand-direction"
|
class="arrow-left hand-direction"
|
||||||
|
@click="handleChangeCamera('left')"
|
||||||
@mousedown="handleChangeCamera('left')"
|
@mousedown="handleChangeCamera('left')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
|
|
@ -100,7 +104,11 @@
|
||||||
|
|
||||||
<!-- 中间的按钮 -->
|
<!-- 中间的按钮 -->
|
||||||
<div class="row-3-item-1-center">
|
<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>
|
</div>
|
||||||
|
|
||||||
<!-- 描述文字 -->
|
<!-- 描述文字 -->
|
||||||
|
|
@ -114,11 +122,13 @@
|
||||||
<span>缩放</span>
|
<span>缩放</span>
|
||||||
<img
|
<img
|
||||||
style="margin-bottom: 2px"
|
style="margin-bottom: 2px"
|
||||||
|
@click="handleChangeZoomCamera('ZoomIn')"
|
||||||
@mousedown="handleChangeZoomCamera('ZoomIn')"
|
@mousedown="handleChangeZoomCamera('ZoomIn')"
|
||||||
@mouseup="handleStopDeviceCameraZoom()"
|
@mouseup="handleStopDeviceCameraZoom()"
|
||||||
src="@/assets/home-imgs/control-2-add.png"
|
src="@/assets/home-imgs/control-2-add.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeZoomCamera('ZoomOut')"
|
||||||
@mousedown="handleChangeZoomCamera('ZoomOut')"
|
@mousedown="handleChangeZoomCamera('ZoomOut')"
|
||||||
@mouseup="handleStopDeviceCameraZoom()"
|
@mouseup="handleStopDeviceCameraZoom()"
|
||||||
src="@/assets/home-imgs/control-2-reduce.png"
|
src="@/assets/home-imgs/control-2-reduce.png"
|
||||||
|
|
@ -142,24 +152,28 @@
|
||||||
<!-- 上下左右控制按钮 -->
|
<!-- 上下左右控制按钮 -->
|
||||||
<img
|
<img
|
||||||
class="arrow-top"
|
class="arrow-top"
|
||||||
|
@click="handleChangeRobot('5')"
|
||||||
@mousedown="handleChangeRobot('5')"
|
@mousedown="handleChangeRobot('5')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-right"
|
class="arrow-right"
|
||||||
|
@click="handleChangeRobot('8')"
|
||||||
@mousedown="handleChangeRobot('8')"
|
@mousedown="handleChangeRobot('8')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-bottom"
|
class="arrow-bottom"
|
||||||
|
@click="handleChangeRobot('6')"
|
||||||
@mousedown="handleChangeRobot('6')"
|
@mousedown="handleChangeRobot('6')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-left"
|
class="arrow-left"
|
||||||
|
@click="handleChangeRobot('7')"
|
||||||
@mousedown="handleChangeRobot('7')"
|
@mousedown="handleChangeRobot('7')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
|
|
@ -664,7 +678,7 @@ const handleStopDeviceCameraZoom = async () => {
|
||||||
const res = await stopDeviceCameraZoomApi({
|
const res = await stopDeviceCameraZoomApi({
|
||||||
idx: 0,
|
idx: 0,
|
||||||
token: deviceToken.value,
|
token: deviceToken.value,
|
||||||
puid: '201115200268437643',
|
puid: deviceInfo.value?.puId,
|
||||||
})
|
})
|
||||||
|
|
||||||
isStopLeft.value = true
|
isStopLeft.value = true
|
||||||
|
|
|
||||||
|
|
@ -74,24 +74,28 @@
|
||||||
<div class="row-3-item-1">
|
<div class="row-3-item-1">
|
||||||
<!-- 上下左右控制按钮 -->
|
<!-- 上下左右控制按钮 -->
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeCamera('up')"
|
||||||
class="arrow-top hand-direction"
|
class="arrow-top hand-direction"
|
||||||
@mousedown="handleChangeCamera('up')"
|
@mousedown="handleChangeCamera('up')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeCamera('right')"
|
||||||
class="arrow-right hand-direction"
|
class="arrow-right hand-direction"
|
||||||
@mousedown="handleChangeCamera('right')"
|
@mousedown="handleChangeCamera('right')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeCamera('down')"
|
||||||
class="arrow-bottom hand-direction"
|
class="arrow-bottom hand-direction"
|
||||||
@mousedown="handleChangeCamera('down')"
|
@mousedown="handleChangeCamera('down')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeCamera('left')"
|
||||||
class="arrow-left hand-direction"
|
class="arrow-left hand-direction"
|
||||||
@mousedown="handleChangeCamera('left')"
|
@mousedown="handleChangeCamera('left')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
|
|
@ -114,11 +118,13 @@
|
||||||
<span>缩放</span>
|
<span>缩放</span>
|
||||||
<img
|
<img
|
||||||
style="margin-bottom: 2px"
|
style="margin-bottom: 2px"
|
||||||
|
@click="handleChangeZoomCamera('ZoomIn')"
|
||||||
@mousedown="handleChangeZoomCamera('ZoomIn')"
|
@mousedown="handleChangeZoomCamera('ZoomIn')"
|
||||||
@mouseup="handleStopDeviceCameraZoom()"
|
@mouseup="handleStopDeviceCameraZoom()"
|
||||||
src="@/assets/home-imgs/control-2-add.png"
|
src="@/assets/home-imgs/control-2-add.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeZoomCamera('ZoomOut')"
|
||||||
@mousedown="handleChangeZoomCamera('ZoomOut')"
|
@mousedown="handleChangeZoomCamera('ZoomOut')"
|
||||||
@mouseup="handleStopDeviceCameraZoom()"
|
@mouseup="handleStopDeviceCameraZoom()"
|
||||||
src="@/assets/home-imgs/control-2-reduce.png"
|
src="@/assets/home-imgs/control-2-reduce.png"
|
||||||
|
|
@ -142,24 +148,28 @@
|
||||||
<!-- 上下左右控制按钮 -->
|
<!-- 上下左右控制按钮 -->
|
||||||
<img
|
<img
|
||||||
class="arrow-top"
|
class="arrow-top"
|
||||||
|
@click="handleChangeRobot('5')"
|
||||||
@mousedown="handleChangeRobot('5')"
|
@mousedown="handleChangeRobot('5')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-right"
|
class="arrow-right"
|
||||||
|
@click="handleChangeRobot('8')"
|
||||||
@mousedown="handleChangeRobot('8')"
|
@mousedown="handleChangeRobot('8')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-bottom"
|
class="arrow-bottom"
|
||||||
|
@click="handleChangeRobot('6')"
|
||||||
@mousedown="handleChangeRobot('6')"
|
@mousedown="handleChangeRobot('6')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-left"
|
class="arrow-left"
|
||||||
|
@click="handleChangeRobot('7')"
|
||||||
@mousedown="handleChangeRobot('7')"
|
@mousedown="handleChangeRobot('7')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
|
|
@ -684,7 +694,7 @@ const handleStopDeviceCameraZoom = async () => {
|
||||||
const res = await stopDeviceCameraZoomApi({
|
const res = await stopDeviceCameraZoomApi({
|
||||||
idx: 0,
|
idx: 0,
|
||||||
token: deviceToken.value,
|
token: deviceToken.value,
|
||||||
puid: '201115200268437643',
|
puid: deviceInfo.value?.puId,
|
||||||
})
|
})
|
||||||
|
|
||||||
isStopLeft.value = true
|
isStopLeft.value = true
|
||||||
|
|
|
||||||
|
|
@ -318,8 +318,8 @@ const onHandleConfirm = () => {
|
||||||
|
|
||||||
// 判断当前点位和机器人位置是否一致
|
// 判断当前点位和机器人位置是否一致
|
||||||
if (
|
if (
|
||||||
Math.abs(Robot_x - markerParams.value.xCount) > 2 ||
|
Math.abs(Robot_x - markerParams.value.xCount) > 50 ||
|
||||||
Math.abs(Robot_y - markerParams.value.yCount) > 2
|
Math.abs(Robot_y - markerParams.value.yCount) > 50
|
||||||
) {
|
) {
|
||||||
const Position = {
|
const Position = {
|
||||||
Robot_x: markerParams.value.xCount,
|
Robot_x: markerParams.value.xCount,
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,13 @@
|
||||||
alt=""
|
alt=""
|
||||||
@mousedown="handleChangeCamera('up')"
|
@mousedown="handleChangeCamera('up')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
|
@click="handleChangeCamera('up')"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
class="arrow-right hand-direction"
|
class="arrow-right hand-direction"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
alt=""
|
alt=""
|
||||||
|
@click="handleChangeCamera('right')"
|
||||||
@mousedown="handleChangeCamera('right')"
|
@mousedown="handleChangeCamera('right')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
/>
|
/>
|
||||||
|
|
@ -24,6 +26,7 @@
|
||||||
class="arrow-bottom hand-direction"
|
class="arrow-bottom hand-direction"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
alt=""
|
alt=""
|
||||||
|
@click="handleChangeCamera('down')"
|
||||||
@mousedown="handleChangeCamera('down')"
|
@mousedown="handleChangeCamera('down')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
/>
|
/>
|
||||||
|
|
@ -31,6 +34,7 @@
|
||||||
class="arrow-left hand-direction"
|
class="arrow-left hand-direction"
|
||||||
src="@/assets/home-imgs/control-2-arrow.png"
|
src="@/assets/home-imgs/control-2-arrow.png"
|
||||||
alt=""
|
alt=""
|
||||||
|
@click="handleChangeCamera('left')"
|
||||||
@mousedown="handleChangeCamera('left')"
|
@mousedown="handleChangeCamera('left')"
|
||||||
@mouseup="handleChangeCamera('stop')"
|
@mouseup="handleChangeCamera('stop')"
|
||||||
/>
|
/>
|
||||||
|
|
@ -50,12 +54,14 @@
|
||||||
<div class="add-reduce-btn">
|
<div class="add-reduce-btn">
|
||||||
<span>缩放</span>
|
<span>缩放</span>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeZoomCamera('ZoomIn')"
|
||||||
style="margin-left: 20px; transform: rotate(-90deg)"
|
style="margin-left: 20px; transform: rotate(-90deg)"
|
||||||
src="@/assets/home-imgs/control-2-add.png"
|
src="@/assets/home-imgs/control-2-add.png"
|
||||||
@mousedown="handleChangeZoomCamera('ZoomIn')"
|
@mousedown="handleChangeZoomCamera('ZoomIn')"
|
||||||
@mouseup="handleStopDeviceCameraZoom()"
|
@mouseup="handleStopDeviceCameraZoom()"
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeZoomCamera('ZoomOut')"
|
||||||
style="margin-left: 50px; transform: rotate(-90deg)"
|
style="margin-left: 50px; transform: rotate(-90deg)"
|
||||||
src="@/assets/home-imgs/control-2-reduce.png"
|
src="@/assets/home-imgs/control-2-reduce.png"
|
||||||
@mousedown="handleChangeZoomCamera('ZoomOut')"
|
@mousedown="handleChangeZoomCamera('ZoomOut')"
|
||||||
|
|
@ -69,6 +75,7 @@
|
||||||
<div class="row-3-item-3">
|
<div class="row-3-item-3">
|
||||||
<!-- 上下左右控制按钮 -->
|
<!-- 上下左右控制按钮 -->
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeRobot('5')"
|
||||||
@mousedown="handleChangeRobot('5')"
|
@mousedown="handleChangeRobot('5')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
class="arrow-top"
|
class="arrow-top"
|
||||||
|
|
@ -76,6 +83,7 @@
|
||||||
alt=""
|
alt=""
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeRobot('8')"
|
||||||
@mousedown="handleChangeRobot('8')"
|
@mousedown="handleChangeRobot('8')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
class="arrow-right"
|
class="arrow-right"
|
||||||
|
|
@ -83,6 +91,7 @@
|
||||||
alt=""
|
alt=""
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeRobot('6')"
|
||||||
@mousedown="handleChangeRobot('6')"
|
@mousedown="handleChangeRobot('6')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
class="arrow-bottom"
|
class="arrow-bottom"
|
||||||
|
|
@ -90,6 +99,7 @@
|
||||||
alt=""
|
alt=""
|
||||||
/>
|
/>
|
||||||
<img
|
<img
|
||||||
|
@click="handleChangeRobot('7')"
|
||||||
@mousedown="handleChangeRobot('7')"
|
@mousedown="handleChangeRobot('7')"
|
||||||
@mouseup="handleChangeRobot(9)"
|
@mouseup="handleChangeRobot(9)"
|
||||||
class="arrow-left"
|
class="arrow-left"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue