From 6d8658a22f5650f2d8bc14c589eb7cf57986cbd3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 16:01:51 +0800
Subject: [PATCH] feat: 获取直播能力
---
src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue | 2 +-
src/components/CurrentTaskDetails/TaskDetailsRight.vue | 3 ++-
src/components/CurrentTaskDetails/CurrentTaskDetails.vue | 5 +++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
index 7b9219a..f5e59eb 100644
--- a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
+++ b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
@@ -181,7 +181,7 @@
let timer = null
let totalSeconds = 0
-const workspace_id = computed(() => taskDetails?.value?.workspace_id)
+const workspace_id = inject('workspace_id')
const list1 = [
{ key: KeyCode.KEY_Q, text: 'Q', icon: RefreshLeft },
{ key: KeyCode.KEY_W, text: 'W', icon: ArrowUp },
diff --git a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
index 8e33996..66c13cd 100644
--- a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
+++ b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
@@ -82,9 +82,9 @@
//获取相机能力
async function getLiveCapacity() {
const res = await getLiveCapacityApi(workspace_id.value,{ sn: dockSn.value})
- console.log(res.data.data,66666666)
}
const useTaskDetailsCallBack = () => {
+ console.log(workspace_id.value,66666666)
getDeviceLiveUrl()
}
@@ -92,6 +92,7 @@
let { wsInfo, removeWS } = useDroneWS(workspace_id) //ws信息，是一个ref对象
provide('wsInfo', wsInfo)
+provide('workspace_id', workspace_id)
provide('deviceOsdInfo', deviceOsdInfo)
provide('dockOsdInfo', wsInfo?.value?.dock_osd)
provide('dockSn', dockSn)
@@ -108,7 +109,7 @@
let once = true
watch(deviceOsdInfo,()=>{
if (once){
- getLiveCapacity()
+ // getLiveCapacity()
once =false
}
})
diff --git a/src/components/CurrentTaskDetails/TaskDetailsRight.vue b/src/components/CurrentTaskDetails/TaskDetailsRight.vue
index e2652c0..34a7ce1 100644
--- a/src/components/CurrentTaskDetails/TaskDetailsRight.vue
+++ b/src/components/CurrentTaskDetails/TaskDetailsRight.vue
@@ -11,7 +11,7 @@
</div>
</div>
- <BaseControl v-if="taskDetails.workspace_id" />
+ <BaseControl v-if="workspace_id" />
</div>
</template>
<script setup>
@@ -19,6 +19,7 @@
import BaseControl from '@/components/CurrentTaskDetails/ControlPanel/BaseControl.vue'
const taskDetails = inject('taskDetails')
+const workspace_id = inject('workspace_id')
const list = ref([
{ name: '任务编号', value: '', field: 'job_info_num' },
--
Gitblit v1.9.3