Compare commits

..

No commits in common. "0149d4be5998ccd793c1e01dbe39fcefecda9919" and "8a46458f383b1db76e043620e2a548096fcc0c9e" have entirely different histories.

6 changed files with 20 additions and 11 deletions

View File

@ -93,7 +93,7 @@ export default {
}, },
created () { created () {
setInterval(() => { setInterval(() => {
this.rtlRemainingPower += 0 this.rtlRemainingPower += 10
}, 1) }, 1)
} }
} }

View File

@ -407,7 +407,7 @@ export default {
}, },
/** /**
* @description: 发布 mqtt 信息 * @description: 发布 mqtt 信息
* @param {*} jsonData {'item':val} // item: questAss setPlaneState resetState chan11 chan22 chan33 chan44 hookConteroller cameraController * @param {*} jsonData {'item':val} // item: questAss setPlaneState getPlaneState resetState chan11 chan22 chan33 chan44 hookConteroller cameraController
*/ */
publishFun (jsonData) { publishFun (jsonData) {
if (this.plane) { if (this.plane) {
@ -529,6 +529,8 @@ export default {
routeData = JSON.stringify(routeData)// routeData = JSON.stringify(routeData)//
// //
this.publishFun(routeData) this.publishFun(routeData)
//
this.publishFun('{getPlaneState:1}')
} catch (error) { } catch (error) {
this.$message.error('操作失败,航线异常') this.$message.error('操作失败,航线异常')
} }
@ -589,6 +591,8 @@ export default {
this.publishFun(routeData)// this.publishFun(routeData)//
} }
} }
//
this.publishFun('{getPlaneState:1}')
}, },
/** /**
* @description: 匹配声音航点字符串 比如$food_sn$ food_sn匹配成 送餐订单里面的对应字段 * @description: 匹配声音航点字符串 比如$food_sn$ food_sn匹配成 送餐订单里面的对应字段

View File

@ -9,7 +9,6 @@
<!-- 锁定状态 --> <!-- 锁定状态 -->
<div class="flex"> <div class="flex">
<div class="tag flex mac mc iconfont" :class="isLockState ? 'icon-suoding' : 'icon-jiesuo'"> <div class="tag flex mac mc iconfont" :class="isLockState ? 'icon-suoding' : 'icon-jiesuo'">
{{ plane.planeState.state }}
</div> </div>
</div> </div>
<!-- 飞机模式 --> <!-- 飞机模式 -->
@ -20,28 +19,24 @@
<!-- 卫星 --> <!-- 卫星 -->
<div class="flex"> <div class="flex">
<div class="tag flex mac mc iconfont icon-weixing"> <div class="tag flex mac mc iconfont icon-weixing">
{{ plane.planeState.fixType }}
</div> </div>
<div class=" tag flex mac mc f-s-16"> <!-- <div class=" tag flex mac mc f-s-16">
{{ satCount }} {{ satCount }}
</div> </div> -->
</div> </div>
<!-- 电池电压 --> <!-- 电池电压 -->
<div class="flex"> <div class="flex">
<div class="tag flex mac mc iconfont icon-dianya1"> <div class="tag flex mac mc iconfont icon-dianya1">
{{ plane.planeState.voltagBattery }}V
</div> </div>
</div> </div>
<!-- 电池电流 --> <!-- 电池电流 -->
<div class="flex"> <div class="flex">
<div class="tag flex mac mc iconfont icon-dianliu"> <div class="tag flex mac mc iconfont icon-dianliu">
{{ plane.planeState.currentBattery }}A
</div> </div>
</div> </div>
<!-- 飞机高度 --> <!-- 飞机高度 -->
<div class="flex"> <div class="flex">
<div class="tag flex mac mc iconfont icon-gaodu"> <div class="tag flex mac mc iconfont icon-gaodu">
{{ plane.planeState.battCapacity }}
</div> </div>
</div> </div>
<!-- 飞机对地速度 --> <!-- 飞机对地速度 -->

View File

@ -286,8 +286,7 @@ const store = new Vuex.Store({
loadweight: null, // 重量 loadweight: null, // 重量
hookstatus: null, // 钩子状态 hookstatus: null, // 钩子状态
position: [], // [[经度,维度,海拔高度]]累计数组 position: [], // [[经度,维度,海拔高度]]累计数组
battCapacity: null, // 电池容量 battCapacity: null// 电池容量
homePosition: null // 返航点位置
} }
}) })
if (res.data.status === 1) { if (res.data.status === 1) {

View File

@ -107,6 +107,9 @@ export default {
watch: { watch: {
plane (val) { plane (val) {
this.makePlane(val)// this.makePlane(val)//
if (!val.planeState.battCapacity) {
mqtt.publishFun(`cmd/${this.plane.macadd}`, '{"getBattCapacity":1}')//
}
}, },
/** /**
* @description: 更新飞机位置 并画出轨迹 跟随飞机 * @description: 更新飞机位置 并画出轨迹 跟随飞机

View File

@ -102,6 +102,14 @@ export default {
if (plane.planeState.position.length > 1000) { if (plane.planeState.position.length > 1000) {
plane.planeState.position.shift() // 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 { } else {
plane.planeState[key] = jsonData[key] // plane.planeState[key] = jsonData[key] //
} }