From d5e65bafff7cfe6d4c01abc6aacfd6dd2c9285f6 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 10:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
index 79262c9..0dc3ff6 100644
--- a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
+++ b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
@@ -196,9 +196,10 @@
]
const baseInfo = computed(() => {
- const usedStorage = dock_osd_host.value?.storage?.used || 0
+ const usedStorage = dock_osd_host.value?.storage?.used || baseInfo.value?.[1]?.[1]?.value || 0
const zoom_factor = device_osd_host.value?.cameras?.[0]?.zoom_factor || 0
const usedStorageGB = _.round(usedStorage / 1024 / 1024, 2)
+
return [
[
{ name: '焦距倍数', value: zoom_factor },
@@ -398,7 +399,7 @@
watch(
() => workspace_id.value,
async () => {
- if (workspace_id.value) {
+ if (workspace_id.value && mqttState === null && client_id.value === '') {
await createConnect()
// 使用控制
manualControl = useManualControl(mqttState, deviceTopicInfo.value, flightController, paramsRef)
--
Gitblit v1.9.3