From 8f436e8f6ff26083e5f5c07b39eb1581772a32b7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 17 Apr 2025 11:07:53 +0800
Subject: [PATCH] feat: 无人机控制调整
---
src/components/CurrentTaskDetails/CurrentTaskDetails.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
index 79e4a97..8dd53e3 100644
--- a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
+++ b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
@@ -18,8 +18,8 @@
<TaskDetailsRight v-if="isAutoControl" />
<template v-else>
<TaskDetailsHead />
+ <TaskDetailsLeft />
</template>
- <TaskDetailsLeft />
<!-- 控制面板，里面有方法需要立即执行，不可用v-if -->
@@ -59,8 +59,12 @@
const deviceOsdInfo = ref({})
provide('taskDetails', taskDetails)
provide('deviceOsdInfo', deviceOsdInfo)
-provide('dockSn', taskDetails?.value?.device_sns?.[0])
-provide('droneSn', deviceOsdInfo?.value?.data?.sn)
+
+const dockSn = computed(() => taskDetails?.value?.device_sns?.[0])
+const droneSn = computed(() => deviceOsdInfo?.value?.data?.sn)
+
+provide('dockSn', dockSn)
+provide('droneSn', droneSn)
// 机巢直播
@@ -81,6 +85,7 @@
// 无人机直播画质切换
const changeLineQuality = async () => {
+ if (droneLiveUrl.value) return droneLiveUrl.value
const res = await liveStart(droneSn, lineQuality.value)
droneLiveUrl.value = res.data.data.rtcs_url
return droneLiveUrl.value
@@ -115,7 +120,7 @@
switch (payload.biz_code) {
case EBizCode.DeviceOsd: {
deviceOsdInfo.value = payload
- // console.log(deviceOsdInfo.value,'osd信息')
+ console.log(deviceOsdInfo.value,'device_osd信息')
setCurrentLiveUrl()
break
}
@@ -141,10 +146,6 @@
}
)
-const removeEvent = () => {
- connectWs?.close()
- deviceOsdInfo.value = {}
-}
onMounted(() => {
getTaskDetails()
@@ -152,8 +153,10 @@
})
onBeforeUnmount(() => {
+ connectWs?.close()
+ deviceOsdInfo.value = {}
+ connectWs = null
EventBus.off('CurrentTaskDetails-timeStop', changeLineQuality)
- removeEvent()
})
</script>
--
Gitblit v1.9.3