diff --git a/src/components/ControllerTabs.vue b/src/components/ControllerTabs.vue index 8820455..de2af08 100644 --- a/src/components/ControllerTabs.vue +++ b/src/components/ControllerTabs.vue @@ -1,7 +1,7 @@ + +
@@ -100,8 +114,7 @@ 航点写入中··· + icon="f-s-14 iconfont icon-jiesuo" @click="publishFun('{unlock:1}'); speakText('解锁飞机')"> 解锁飞机
+ @click="publishFun('{unlock:1}'); speakText('解锁飞机')">
解锁
+ @click="confirmation('飞机加锁,螺旋桨将停转,请谨慎操作!', '加锁操作', '{lock:1}'); speakText('加锁,请注意安全')">
加锁
+ @click="dialogVisible = true; dialogTitle = '高度设置(米)'; dialogItem = 'takeoffBox'; speakText('设置起飞高度')">
起飞
+ @click="publishFun('{loiterMode:1}'); speakText('悬停')">
悬停
- +
复航
@@ -257,11 +271,13 @@
磁罗盘
- + -
加速度计
+
{{ acceState }}
- +
写入参数
@@ -395,6 +411,15 @@ export default { return this.plane.planeState.reportCal } return null + }, + /** + * @description:加速度计 状态 + */ + acceState () { + if (this.plane && this.plane.planeState && this.plane.planeState.acceState) { + return this.plane.planeState.acceState + } + return '加速度计' } }, methods: { @@ -406,6 +431,10 @@ export default { this.dialogVisible = false this.plane.planeState.reportCal = null }, + /** 弹出框 关闭事件回调 */ + closeCallback () { + if (this.dialogItem === 'compassBox') { this.handlerCloseCompassBox() } + }, /** * @description: 摄像头 滑动条松开 * @param {string} item 项目 diff --git a/src/store/index.js b/src/store/index.js index 74d68bf..94ca54f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -281,7 +281,7 @@ const store = new Vuex.Store({ completionPct: null, // 磁罗盘校准进度 reportCal: null, // 磁罗盘校准结果 state: 1, // 飞机状态 默认初始状态为1 - pingNet: null, // 网速测试 + acceState: null, // 加速度计校准状态 getPlaneMode: null, // 飞机模式 loadweight: null, // 重量 hookstatus: null, // 钩子状态