From 2800fa4f32f3900509cb4d6eefaf2bfaf54efdd7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:29:09 +0800
Subject: [PATCH] fix: 天气显示
---
src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
index 7b9219a..cf4331e 100644
--- a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
+++ b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
@@ -158,6 +158,7 @@
const droneSn = inject('droneSn')
const trueAltitude = inject('trueAltitude')
const client_id = inject('client_id')
+const isBackDock = inject('isBackDock')
const deviceTopicInfo = ref({
pubTopic: '',
@@ -181,7 +182,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 },
@@ -324,9 +325,10 @@
function cancelControl() {
exitController({ client_id: client_id.value, dock_sn: dockSn.value })
.then(res => {
- flightController.value = false
deviceTopicInfo.value.subTopic = ''
deviceTopicInfo.value.pubTopic = ''
+ flightController.value = false
+ isAutoControl.value = true
ElMessage.success('退出飞行控制成功')
})
.catch(e => {})
@@ -358,13 +360,14 @@
})
}
-const isBackDock = ref(false)
+
// 返航
async function onBackDock() {
await returnHome(dockSn?.value)
ElMessage.success('返航操作成功')
isBackDock.value = true
+ isAutoControl.value = true
}
// 取消返航
@@ -372,6 +375,7 @@
await returnHomeCancel({ dock_sn: dockSn?.value, client_id: client_id.value })
ElMessage.success('取消返航成功')
isBackDock.value = false
+ isAutoControl.value = false
}
// 创建mqtt连接
@@ -406,8 +410,7 @@
speed: speed.value,
}))
-watch(
- () => workspace_id.value,
+watch(workspace_id,
async () => {
if (workspace_id.value && mqttState === null && client_id.value === '') {
await createConnect()
--
Gitblit v1.9.3