提交 fd7e54e8 作者: 温凯

fix(uav): 移除起飞备降点检查并修复一键任务提示

上级 b006f126
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="control-bottom"> <div class="control-bottom">
<div class="control-bottom-item" @click="onStartTask"> <div class="control-bottom-item" @click="onStartTask">
<img src="./assets/images/start.svg" /> <img src="./assets/images/start.svg" />
<span class="dib">一键任务</span> <span class="dib">一键任务 </span>
</div> </div>
<div class="control-bottom-item" @click="onReturnFlight"> <div class="control-bottom-item" @click="onReturnFlight">
<img src="./assets/images/return.svg" /> <img src="./assets/images/return.svg" />
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="btn" @click="onStartTask" v-hover>一键任务</div> <div class="btn" @click="onStartTask" v-hover>一键任务</div>
<div class> <div class>
<span class="btn__add-line" @click="showAirwayEdit = true"> <span class="btn__add-line" @click="showAirwayEdit = true">
<span class="f8"></span> 创建航线 <span class="f8"></span> 创建航线
</span> </span>
</div> </div>
</el-form> </el-form>
...@@ -72,7 +72,7 @@ export default { ...@@ -72,7 +72,7 @@ export default {
"useSTLAirway", "useSTLAirway",
"useTask", "useTask",
]), ]),
...mapState("MMCFlightControlCenter/uav", ["uav","uavRealTimeData"]), ...mapState("MMCFlightControlCenter/uav", ["uav", "uavRealTimeData"]),
// 选择的任务 // 选择的任务
selectedTask() { selectedTask() {
let find = this.taskList.find((item) => { let find = this.taskList.find((item) => {
...@@ -176,7 +176,7 @@ export default { ...@@ -176,7 +176,7 @@ export default {
this.bus.$on("refreshAirway", this.getAirwayList); this.bus.$on("refreshAirway", this.getAirwayList);
await this.getTaskList(); await this.getTaskList();
await this.getAirwayList(); await this.getAirwayList();
console.log(this.uavRealTimeData,'this.uavRealTimeData'); console.log(this.uavRealTimeData, "this.uavRealTimeData");
// 获取正在飞行的航线 // 获取正在飞行的航线
if (this.uavRealTimeData.isFlying) { if (this.uavRealTimeData.isFlying) {
this.getTaskInfoRecord(); this.getTaskInfoRecord();
...@@ -266,10 +266,15 @@ export default { ...@@ -266,10 +266,15 @@ export default {
this.$message.warning("请选择航线"); this.$message.warning("请选择航线");
return; return;
} }
let diversionPoint = this.uav.diversionPoint;
if (!diversionPoint) {
return this.$message.warning("设备暂无备降点无法进行一键任务,请前往后台管理设置备降点!");
}
let data = this.taskList.filter((item) => item.id == this.selectedTaskId); let data = this.taskList.filter((item) => item.id == this.selectedTaskId);
if (data && data[0].status == "执行中") { if (data && data[0].status == "执行中") {
return this.$message.warning("当前任务执行中"); return this.$message.warning("当前任务执行中");
} }
try { try {
await this.$confirm("请确认是否进行一键任务操作?", "安全确认", { await this.$confirm("请确认是否进行一键任务操作?", "安全确认", {
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -277,6 +282,7 @@ export default { ...@@ -277,6 +282,7 @@ export default {
customClass: "uav_controlPane", customClass: "uav_controlPane",
showClose: false, showClose: false,
}); });
//
this.$store.commit("MMCFlightControlCenter/uav/setState", { this.$store.commit("MMCFlightControlCenter/uav/setState", {
key: "airlineData", key: "airlineData",
value: this.selectedAirway, value: this.selectedAirway,
......
...@@ -704,12 +704,6 @@ const actions = { ...@@ -704,12 +704,6 @@ const actions = {
* @param {object} data.taskInfoId //任务id * @param {object} data.taskInfoId //任务id
*/ */
async takeOff({ state, commit }, data) { async takeOff({ state, commit }, data) {
let diversionPoint = state.uav.diversionPoint;
if (!diversionPoint) {
return this.$message.warning("设备暂无备降点,无法进行一键起飞!");
}
let diversionPointArr = diversionPoint.split(",");
console.log(diversionPointArr, "diversionPointArr");
if (state.uav.network == 2) { if (state.uav.network == 2) {
try { try {
let flightSortieId; let flightSortieId;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论