From 82e171173ac6c9c21973e8bd7e4651e9bd012f8c Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 18 Apr 2025 19:54:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/CurrentTaskDetails/CurrentTaskDetails.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
index cc4fe6f..5fe36df 100644
--- a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
+++ b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
@@ -17,11 +17,13 @@
<RealTimeMap :class="`${isMaxMap ? 'maxBox' : 'minBox'}`" />
<TaskDetailsRight v-if="isAutoControl" />
<template v-else>
- <TaskDetailsHead />
- <TaskDetailsLeft />
+
</template>
+ <TaskDetailsHead />
+ <TaskDetailsLeft />
<!-- 控制面板，里面有方法需要立即执行，不可用v-if -->
+<!-- <ControlPanel />-->
<ControlPanel v-show="!isAutoControl" />
<img alt="" :src="amplifyImg" class="amplify" @click="isMaxMap = !isMaxMap" />
</div>
@@ -67,6 +69,9 @@
provide('dockSn', dockSn)
provide('droneSn', droneSn)
+const trueAltitude = ref('')
+provide('trueAltitude', trueAltitude)
+
const isAiLive = ref(false)
provide('isAiLive', isAiLive)
@@ -86,9 +91,13 @@
currentLiveUrl.value = res.data.data.rtcs_url
}
-const getAiLiveUrl = ()=>{
- const res = getLiveAiLinkApi({ original_stream_url: `${CURRENT_CONFIG.rtmpURL}${video_id.value}`, video_id:video_id.value })
+const getAiLiveUrl = async ()=>{
+ const res =await getLiveAiLinkApi({
+ original_stream_url: `${CURRENT_CONFIG.rtmpURL}${video_id.value.replace(/\//g, '-')}`,
+ video_id:video_id.value
+ })
currentLiveUrl.value = res.data.data.rtcs_url
+ ElMessage.success('开启成功')
isAiLive.value = true
}
--
Gitblit v1.9.3