From 2c435d1da00ba1b92ef2ed8e77c5cda4cbb2e93f Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sun, 20 Apr 2025 11:54:04 +0800
Subject: [PATCH] feat: 优化控制激活样式
---
src/hooks/useTaskWayline/useTaskWayline.js | 10 ++++------
src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue | 3 ++-
src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue | 7 ++++---
src/components/CurrentTaskDetails/CurrentTaskDetails.vue | 9 +++++----
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue b/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue
index c365f48..51dd9dc 100644
--- a/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue
+++ b/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue
@@ -31,9 +31,10 @@
import EventBus from '@/event-bus'
const isAutoControl = inject('isAutoControl')
+const isBackDock = inject('isBackDock')
const list3 = computed(() => [
- { name: '自动控制', svg: 'autoControl', style: { top: '-70%' }, active: isAutoControl.value, handle: autoControl },
+ { name: '自动控制', svg: 'autoControl', style: { top: '-70%' }, active: isAutoControl.value && !isBackDock.value, handle: autoControl },
//如果是返航， 继续任务 就是自动任务
//如果是取消返航， 继续任务 就是自动任务
{ name: '继续任务', svg: 'continueTask', style: { left: '70%' }, active: false, handle: autoControl },
@@ -41,10 +42,10 @@
name: '手动控制',
svg: 'manualControl',
style: { top: '70%' },
- active: !isAutoControl.value,
+ active: !isAutoControl.value && !isBackDock.value,
handle: manualControl,
},
- { name: '返航/取消返航', svg: 'turnBack', style: { left: '-70%' }, active: false, handle: turnBack },
+ { name: '返航/取消返航', svg: 'turnBack', style: { left: '-70%' }, active: isBackDock.value, handle: turnBack },
])
function autoControl() {
diff --git a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
index 6873e0a..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: '',
@@ -359,7 +360,7 @@
})
}
-const isBackDock = ref(false)
+
// 返航
async function onBackDock() {
diff --git a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
index 723764b..ea92bd8 100644
--- a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
+++ b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
@@ -71,11 +71,12 @@
const client_id = ref('') //mqtt id
const hasIr = ref(false) //有红外能力
let once = true //第一次触发
-
-let { taskDetails, workspace_id, getTaskDetails } = useTaskDetails(()=> getDeviceLiveUrl())
-let { wsInfo, removeWS } = useDroneWS(workspace_id) //ws信息，是一个ref对象
+const isBackDock = ref(false)
+let { taskDetails, workspace_id, getTaskDetails:initTaskDetails } = useTaskDetails(()=> getDeviceLiveUrl())
+let { wsInfo } = useDroneWS(workspace_id) //ws信息，是一个ref对象
provide('wsInfo', wsInfo)
+provide('isBackDock', isBackDock)
provide('workspace_id', workspace_id)
provide('dockOsdInfo', wsInfo?.value?.dock_osd)
provide('dockSn', dockSn)
@@ -157,7 +158,7 @@
watch(wsInfo, setCurrentLiveUrl, { deep: true })
onMounted(() => {
- getTaskDetails(props?.id)
+ initTaskDetails(props?.id)
EventBus.on('CurrentTaskDetails-timeStop', changeLineQuality)
EventBus.on('CurrentTaskDetails-getAiLiveUrl', getAiLiveUrl)
EventBus.on('CurrentTaskDetails-getDroneLiveUrl', getDroneLiveUrl)
diff --git a/src/hooks/useTaskWayline/useTaskWayline.js b/src/hooks/useTaskWayline/useTaskWayline.js
index 506c46c..df11f81 100644
--- a/src/hooks/useTaskWayline/useTaskWayline.js
+++ b/src/hooks/useTaskWayline/useTaskWayline.js
@@ -4,9 +4,9 @@
* @LastEditors: shuishen 1109946754@qq.com
* @LastEditTime: 2025-04-19 19:00:36
* @FilePath: \command-center-dashboard\src\hooks\useTaskWayline\useTaskWayline.js
- * @Description:
- *
- * Copyright (c) 2025 by shuishen, All Rights Reserved.
+ * @Description:
+ *
+ * Copyright (c) 2025 by shuishen, All Rights Reserved.
*/
import lineImg from '@/assets/images/arrow-right-blue.png'
import rwqfdImg from '@/assets/images/signMachineNest/rwqfd.png'
@@ -117,8 +117,6 @@
function setAircraftGltf () {
const host = deviceOsdInfo.value?.data?.host
- console.log(host, 1111111111)
-
const aircraftEntity = viewer?.entities.getById('aircraftGltf')
const position = Cesium.Cartesian3.fromDegrees(host?.longitude, host?.latitude, host?.height)
if (aircraftEntity) {
@@ -215,4 +213,4 @@
removeEntitys,
mapEntityRemove,
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3