Compare commits
No commits in common. "0149d4be5998ccd793c1e01dbe39fcefecda9919" and "8a46458f383b1db76e043620e2a548096fcc0c9e" have entirely different histories.
0149d4be59
...
8a46458f38
@ -93,7 +93,7 @@ export default {
|
||||
},
|
||||
created () {
|
||||
setInterval(() => {
|
||||
this.rtlRemainingPower += 0
|
||||
this.rtlRemainingPower += 10
|
||||
}, 1)
|
||||
}
|
||||
}
|
||||
|
@ -407,7 +407,7 @@ export default {
|
||||
},
|
||||
/**
|
||||
* @description: 发布 mqtt 信息
|
||||
* @param {*} jsonData {'item':val} // item: questAss飞行航点任务 setPlaneState 设置飞机状态 resetState设置飞机初始状态 chan1油门通道1 chan2油门通道2 chan3油门通道3 chan4油门通道4 hookConteroller钩子控制 cameraController云台相机控制
|
||||
* @param {*} jsonData {'item':val} // item: questAss飞行航点任务 setPlaneState 设置飞机状态 getPlaneState获取飞机状态 resetState设置飞机初始状态 chan1油门通道1 chan2油门通道2 chan3油门通道3 chan4油门通道4 hookConteroller钩子控制 cameraController云台相机控制
|
||||
*/
|
||||
publishFun (jsonData) {
|
||||
if (this.plane) {
|
||||
@ -529,6 +529,8 @@ export default {
|
||||
routeData = JSON.stringify(routeData)// 重新序列化
|
||||
// 发送航点信息主题
|
||||
this.publishFun(routeData)
|
||||
// 主动获取飞机状态
|
||||
this.publishFun('{getPlaneState:1}')
|
||||
} catch (error) {
|
||||
this.$message.error('操作失败,航线异常')
|
||||
}
|
||||
@ -589,6 +591,8 @@ export default {
|
||||
this.publishFun(routeData)// 发送航点信息主题
|
||||
}
|
||||
}
|
||||
// 主动获取飞机状态
|
||||
this.publishFun('{getPlaneState:1}')
|
||||
},
|
||||
/**
|
||||
* @description: 匹配声音航点字符串 比如$food_sn$ food_sn匹配成 送餐订单里面的对应字段
|
||||
|
@ -9,7 +9,6 @@
|
||||
<!-- 锁定状态 -->
|
||||
<div class="flex">
|
||||
<div class="tag flex mac mc iconfont" :class="isLockState ? 'icon-suoding' : 'icon-jiesuo'">
|
||||
{{ plane.planeState.state }}
|
||||
</div>
|
||||
</div>
|
||||
<!-- 飞机模式 -->
|
||||
@ -20,28 +19,24 @@
|
||||
<!-- 卫星 -->
|
||||
<div class="flex">
|
||||
<div class="tag flex mac mc iconfont icon-weixing">
|
||||
{{ plane.planeState.fixType }}
|
||||
</div>
|
||||
<div class=" tag flex mac mc f-s-16">
|
||||
<!-- <div class=" tag flex mac mc f-s-16">
|
||||
{{ satCount }}颗
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<!-- 电池电压 -->
|
||||
<div class="flex">
|
||||
<div class="tag flex mac mc iconfont icon-dianya1">
|
||||
{{ plane.planeState.voltagBattery }}V
|
||||
</div>
|
||||
</div>
|
||||
<!-- 电池电流 -->
|
||||
<div class="flex">
|
||||
<div class="tag flex mac mc iconfont icon-dianliu">
|
||||
{{ plane.planeState.currentBattery }}A
|
||||
</div>
|
||||
</div>
|
||||
<!-- 飞机高度 -->
|
||||
<div class="flex">
|
||||
<div class="tag flex mac mc iconfont icon-gaodu">
|
||||
{{ plane.planeState.battCapacity }}
|
||||
</div>
|
||||
</div>
|
||||
<!-- 飞机对地速度 -->
|
||||
|
@ -286,8 +286,7 @@ const store = new Vuex.Store({
|
||||
loadweight: null, // 重量
|
||||
hookstatus: null, // 钩子状态
|
||||
position: [], // [[经度,维度,海拔高度]]累计数组
|
||||
battCapacity: null, // 电池容量
|
||||
homePosition: null // 返航点位置
|
||||
battCapacity: null// 电池容量
|
||||
}
|
||||
})
|
||||
if (res.data.status === 1) {
|
||||
|
@ -107,6 +107,9 @@ export default {
|
||||
watch: {
|
||||
plane (val) {
|
||||
this.makePlane(val)// 有飞机数据之后 在地图上创建飞机
|
||||
if (!val.planeState.battCapacity) {
|
||||
mqtt.publishFun(`cmd/${this.plane.macadd}`, '{"getBattCapacity":1}')// 发送设置飞机状态主题 请求飞控返回 电池总容量
|
||||
}
|
||||
},
|
||||
/**
|
||||
* @description: 更新飞机位置 并画出轨迹 跟随飞机
|
||||
|
@ -102,6 +102,14 @@ export default {
|
||||
if (plane.planeState.position.length > 1000) {
|
||||
plane.planeState.position.shift() // 删除最早的经纬度
|
||||
}
|
||||
} else if (key === 'parameter') {
|
||||
// 如果是 get飞控参数 判断设置对应值
|
||||
const parameter = JSON.parse(jsonData.parameter.trim())
|
||||
for (const k in parameter) {
|
||||
if (k === 'BATT_CAPACITY') {
|
||||
plane.planeState.battCapacity = parameter.BATT_CAPACITY
|
||||
}
|
||||
}
|
||||
} else {
|
||||
plane.planeState[key] = jsonData[key] // 按订阅信息 刷新飞机状态
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user