diff --git a/src/components/BatteryStatus.vue b/src/components/BatteryStatus.vue index c66cfdc..d23ca1d 100644 --- a/src/components/BatteryStatus.vue +++ b/src/components/BatteryStatus.vue @@ -93,7 +93,7 @@ export default { }, created () { setInterval(() => { - this.rtlRemainingPower += 10 + this.rtlRemainingPower += 0 }, 1) } } diff --git a/src/store/index.js b/src/store/index.js index 69e31e4..40ea8a2 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -286,7 +286,8 @@ const store = new Vuex.Store({ loadweight: null, // 重量 hookstatus: null, // 钩子状态 position: [], // [[经度,维度,海拔高度]]累计数组 - battCapacity: null// 电池容量 + battCapacity: null, // 电池容量 + homePosition: null // 返航点位置 } }) if (res.data.status === 1) { diff --git a/src/views/layout/components/main/planes/index.vue b/src/views/layout/components/main/planes/index.vue index c46b036..aa6bcc7 100644 --- a/src/views/layout/components/main/planes/index.vue +++ b/src/views/layout/components/main/planes/index.vue @@ -107,9 +107,6 @@ export default { watch: { plane (val) { this.makePlane(val)// 有飞机数据之后 在地图上创建飞机 - if (!val.planeState.battCapacity) { - mqtt.publishFun(`cmd/${this.plane.macadd}`, '{"getBattCapacity":1}')// 发送设置飞机状态主题 请求飞控返回 电池总容量 - } }, /** * @description: 更新飞机位置 并画出轨迹 跟随飞机 diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 74fed76..e998f76 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -102,14 +102,6 @@ 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] // 按订阅信息 刷新飞机状态 }