diff --git a/src/components/FlvPlayer/index.vue b/src/components/FlvPlayer/index.vue
index b57637a..bb98048 100644
--- a/src/components/FlvPlayer/index.vue
+++ b/src/components/FlvPlayer/index.vue
@@ -2,11 +2,12 @@
@@ -15,6 +16,7 @@
import flv from 'flv.js'
import { ref, watch, nextTick, onBeforeUnmount } from 'vue'
+const videoPlayer = ref(null)
let flvPlayerList = []
let replayCount = 0
@@ -106,6 +108,16 @@ const progress = (e) => {
}
}
+const toggleFullscreen = () => {
+ if (!videoPlayer.value) return
+
+ if (document.fullscreenElement) {
+ document.exitFullscreen()
+ } else {
+ videoPlayer.value.requestFullscreen()
+ }
+}
+
onBeforeUnmount(() => {
stopvideo()
})
diff --git a/src/views/home/components/left-two.vue b/src/views/home/components/left-two.vue
index 688e005..3cd926a 100644
--- a/src/views/home/components/left-two.vue
+++ b/src/views/home/components/left-two.vue
@@ -54,8 +54,12 @@ const markPoints = (Robot_x, Robot_y) => {
console.log(Robot_x, Robot_y, 'Robot_x, Robot_y')
const svgRect = svgMapRef.value.getBoundingClientRect()
+
+ console.log(svgRect, 'svgRect', svgHeight.value, yScale.value, svgRect.top)
const clientY = svgHeight.value - yScale.value * Robot_y + svgRect.top
const logicalY1 = (clientY - svgRect.top) / yScale.value
+
+ console.log(clientY, logicalY1, 'xScale.value, yScale.value')
devicePoints.value.push({ x: Robot_x, y: logicalY1 })
}
@@ -76,6 +80,8 @@ onMounted(async () => {
mapInfo.value = await getRobotMapInfoFn(deviceInfo?.puId)
mapImage.value = mapInfo.value?.mapBase64
// 计算缩放比例
+
+ console.log(mapInfo.value, 'mapInfo.value----')
calculateScale(mapInfo.value?.mapWidth, mapInfo.value?.mapHeight)
// 获取机器人点位
const pointsInfo = await getRobotPointsInfoFn(deviceInfo?.puId)
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 944a58c..f13be6b 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
@@ -326,10 +326,10 @@ const onHandleConfirm = () => {
content: '机器人当前位置与预置点位不一致,确定新增吗?',
positiveText: '确定新增',
negativeText: '取消',
- onPositiveClick: () => {},
- onNegativeClick: async () => {
+ onPositiveClick: async () => {
addOrEditMarker(isCurrentPosition)
},
+ onNegativeClick: () => {},
})
}
} else {
diff --git a/src/views/home/components/modal-content/preset-setting.vue b/src/views/home/components/modal-content/preset-setting.vue
index 876f342..af9c54e 100644
--- a/src/views/home/components/modal-content/preset-setting.vue
+++ b/src/views/home/components/modal-content/preset-setting.vue
@@ -3,7 +3,7 @@
@@ -12,6 +12,7 @@
ref="planeMapContainer"
:class="{ 'can-drag': canDrag() }"
:style="{ height: INITIAL_HEIGHT + 'px' }"
+ style="min-height: 60vh"
@mousemove="handleMouseMove"
>