From f6fd494699bcfee4457b415fcbbc02b753a3ff28 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 16:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/CurrentTaskDetails/CurrentTaskDetails.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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
}
})
--
Gitblit v1.9.3