From e9c5da455e223c6463b8d64d5663221b19ceb297 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 15 Mar 2025 11:09:16 +0800
Subject: [PATCH] 更新二代机控制台和分享功能
---
src/views/components/controlConsole.vue | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/views/components/controlConsole.vue b/src/views/components/controlConsole.vue
index d695bbf..620e88b 100644
--- a/src/views/components/controlConsole.vue
+++ b/src/views/components/controlConsole.vue
@@ -1,8 +1,13 @@
<template>
<div class="control-console">
+ <!-- <div class="control-btn">
+ <van-button @click="onBackDock">返航</van-button>
+ <van-button @click="notonBackDock">取消返航</van-button>
+ </div> -->
<div class="control" :class="isShowKzBtn?'actived-blue':''" @click="authenticationPwd">
<img src="@/assets/images/open-close.png" />
</div>
+
<div class="control-left" v-show="isShowKzBtn">
<div class="top" @touchstart="handlePublish('xq')"><div class="xq">向前</div></div>
<div class="left" @touchstart="handlePublish('xz')"><div class="xz">向左</div></div>
@@ -55,6 +60,7 @@
let flightMode = ref('自动控制')
let genPortOne = ref(false)
+console.log(store.state.airPortInfo.deviceType,store.state.airPortInfo.subType,store.state.airPortInfo.domain)
if (store.state.airPortInfo.deviceType == 1 && store.state.airPortInfo.subType == 0 && store.state.airPortInfo.domain == 3) {
genPortOne.value = true
}
@@ -144,7 +150,7 @@
// 返航
const onBackDock = () => {
- returnHome(props.sn).then((res) => {
+ returnHome(props.osdVisible.dockSn).then((res) => {
if (res.code === 0) {
nowInReturnStatus.value = true
flightMode.value = '自动控制'
@@ -186,21 +192,21 @@
// if (!hasPermission.value) { return showNotify({ type: 'warning', message: '暂无无人机控制权限' });}
let params = ref({})
if (str === 'xq') {
- params.value = genPortOne.value ? { x: SPEED.value,seq: seq.value++ } : { x: (1024+SPEED.value),seq: seq.value++ }
+ params.value = genPortOne.value ? { x: SPEED.value,seq: seq.value++ } : { pitch: (1024+SPEED.value),seq: seq.value++ }
} else if(str === 'xz') {
- params.value = genPortOne.value ? { y: -SPEED.value,seq: seq.value++ } : { y: (1024-SPEED.value),seq: seq.value++ }
+ params.value = genPortOne.value ? { y: -SPEED.value,seq: seq.value++ } : { roll: (1024-SPEED.value),seq: seq.value++ }
} else if(str === 'xx') {
- params.value = genPortOne.value ? { x: -SPEED.value,seq: seq.value++ } : { x: (1024-SPEED.value),seq: seq.value++ }
+ params.value = genPortOne.value ? { x: -SPEED.value,seq: seq.value++ } : { pitch: (1024-SPEED.value),seq: seq.value++ }
} else if(str === 'xy') {
- params.value = genPortOne.value ? { y: SPEED.value,seq: seq.value++ } : { y: (1024+SPEED.value),seq: seq.value++ }
+ params.value = genPortOne.value ? { y: SPEED.value,seq: seq.value++ } : { roll: (1024+SPEED.value),seq: seq.value++ }
} else if(str === 'ss') {
- params.value = genPortOne.value ? { h: HEIGHT.value,seq: seq.value++ } : { h: (1024+HEIGHT.value),seq: seq.value++ }
+ params.value = genPortOne.value ? { h: HEIGHT.value,seq: seq.value++ } : { throttle: (1024+HEIGHT.value),seq: seq.value++ }
} else if(str === 'zz') {
- params.value = genPortOne.value ? { w: -W_SPEED.value,seq: seq.value++ } : { w: (1024-W_SPEED.value),seq: seq.value++ }
+ params.value = genPortOne.value ? { w: -W_SPEED.value,seq: seq.value++ } : { yaw: (1024-W_SPEED.value),seq: seq.value++ }
} else if(str === 'xj') {
- params.value = genPortOne.value ? { h: -HEIGHT.value,seq: seq.value++ } : { h: (1024-HEIGHT.value),seq: seq.value++ }
+ params.value = genPortOne.value ? { h: -HEIGHT.value,seq: seq.value++ } : { throttle: (1024-HEIGHT.value),seq: seq.value++ }
} else if(str === 'yz') {
- params.value = genPortOne.value ? { w: W_SPEED.value,seq: seq.value++ } : { w: (1024+W_SPEED.value),seq: seq.value++ }
+ params.value = genPortOne.value ? { w: W_SPEED.value,seq: seq.value++ } : { yaw: (1024+W_SPEED.value),seq: seq.value++ }
}
const body = { method: genPortOne.value?'drone_control':'stick_control', data: params.value}
mqttHooks?.publishMqtt(deviceTopicInfo.pubTopic, body, {qos: 0})
@@ -214,6 +220,21 @@
<style lang="scss" scoped>
.control-console {
+ // .control-btn {
+ // position: absolute;
+ // top: 0rem;
+ // right: 0.2rem;
+ // // width: 2rem;
+ // // height: 2rem;
+ // border-radius: 3px;
+ // background-color: rgba(0, 0, 0, 0.5);
+ // // display: flex;
+ // align-items: center;
+ // justify-content: center;
+ // overflow: hidden;
+ // cursor: pointer;
+ // pointer-events: all;
+ // }
.control {
position: absolute;
--
Gitblit v1.9.3