Food/food
3
0
Fork 0
Code Issues 60 Pull Requests Actions Packages Projects Releases Wiki Activity

【类 型】：factor 后端改属性名字 前端同步

Browse Source 
【原  因】：
【过  程】：
【影  响】：
This commit is contained in:
tk 2024-09-02 17:50:58 +08:00
parent 283883202e
commit e8a159c962
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/ControllerTabs.vue
View File

@ -134,25 +134,25 @@
</template>
<el-form-item label="飞机操作">
<el-button-group>
<el-button size="mini" class="f-s-14" v-if="Number(plane.planeState.state) === 1" type="primary"
<el-button size="mini" class="f-s-14" v-if="Number(plane.planeState.questState) === 1" type="primary"
icon="f-s-14 iconfont icon-chakanzhihangrizhi" @click="checkQuest">
<font class="m-l-5">上传航点</font>
</el-button>
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.state) === 2" key="wirteBut"
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 2" key="wirteBut"
type="info" :loading="true" disabled>
<font class="m-l-5">航点写入中···</font>
</el-button>
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.state) === 4" type="warning"
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 4" type="warning"
icon="f-s-14 iconfont icon-jiesuo" @click="publishFun('{unlock:1}'); speakText('解锁飞机')">
<font class="m-l-5">解锁飞机</font>
</el-button>
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.state) === 12" type="info"
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 12" type="info"
:loading="true" disabled>
<font class="m-l-5">解锁中...</font>
</el-button>
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.state) === 20" type="success"
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 20" type="success"
icon="f-s-14 iconfont icon-yangshi_icon_tongyong_departure"
@click="publishFun('{setPlaneState:{bit:5,state:1}}'); speakText('准备起飞，执行送餐任务')">
@click="publishFun('{setQuestState:{bit:5,state:1}}'); speakText('准备起飞，执行送餐任务')">
<font class="m-l-5">执行任务</font>
</el-button>
<el-button size="mini" class="f-s-14" v-else-if="isShipped" type="info" :loading="true" disabled>
@ -537,7 +537,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飞行航点任务 setQuestState 设置飞机状态 resetQuestState设置飞机初始状态 chan1油门通道1 chan2油门通道2 chan3油门通道3 chan4油门通道4 hookConteroller钩子控制 cameraController云台相机控制
*/
publishFun (jsonData) {
if (this.plane) {
@ -804,7 +804,7 @@ export default {
})
if (res.data.status === 1) {
this.publishFun('{"resetState":1}') // 发送设置飞机状态主题 状态设为闲置
this.publishFun('{"resetQuestState":1}') // 发送设置飞机状态主题 状态设为闲置
}
}
} catch (error) {
@ -850,7 +850,7 @@ export default {
})
if (res.data.status === 1) {
this.publishFun('{"resetState":1}') // 发送设置飞机状态主题 状态设为闲置
this.publishFun('{"resetQuestState":1}') // 发送设置飞机状态主题 状态设为闲置
}
}
} catch (error) {
@ -960,7 +960,7 @@ export default {
}
} else { // 没有执行订单
if (this.plane) {
this.publishFun('{"resetState":1}')// 发送设置飞机状态主题 状态设为闲置
this.publishFun('{"resetQuestState":1}')// 发送设置飞机状态主题 状态设为闲置
}
}
},
@ -979,7 +979,7 @@ export default {
this.setExecuteOrderTag(val)
} else {
this.$emit('clearRoute')// 如果没有执行任务 把地图上航线清除
this.publishFun('{"resetState":1}')// 发送设置飞机状态主题 状态设为闲置
this.publishFun('{"resetQuestState":1}')// 发送设置飞机状态主题 状态设为闲置
}
},
questList (val) {

2
src/store/index.js
View File

@ -280,7 +280,7 @@ const store = new Vuex.Store({
fixType: null, // 定位状态
completionPct: 0, // 磁罗盘校准进度
reportCal: null, // 磁罗盘校准结果
state: 1, // 飞机状态 默认初始状态为1
questState: 1, // 飞机状态 默认初始状态为1
acceState: null, // 加速度计校准状态
getPlaneMode: null, // 飞机模式
loadweight: null, // 重量