提交 0d15b2ef 作者: 温凯

fix:任务库-已关联任务和航线飞行-同一个账号多个ip登录时,已关联飞行任务及航线未反显出来,需同步显示

上级 93e5c904
......@@ -3,12 +3,12 @@
<el-form class="task-main" label-width="70px">
<el-form-item label="任务库:" v-if="useTask">
<el-select v-model="selectedTaskId" clearable>
<el-option v-for="(item , i) in taskList" :label="item.name" :value="item.id"></el-option>
<el-option v-for="(item, i) in taskList" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="航线:">
<el-select v-model="selectedAirwayId">
<el-option v-for="(item , i) in airwayList" :label="item.name" :value="item.id"></el-option>
<el-option v-for="(item, i) in airwayList" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-form>
......@@ -94,6 +94,17 @@ export default {
},
},
watch: {
'uavRealTimeData.isFlying': {
handler: function (val) {
if (val) {
this.getTaskInfoRecord()
}
},
deep: true,
immediate: true,
},
selectedTask() {
if (this.selectedTask.id !== -1) {
this.airwaySelectDisabled = true;
......@@ -128,16 +139,6 @@ export default {
this.bus.$on("startTask", this.onStartTask);
await this.getTaskList();
await this.getAirwayList();
// 获取正在飞行的航线
console.log("当前飞行状态", this.uavRealTimeData?.isFlying);
if (this.uav && this.uavRealTimeData?.isFlying) {
let res = await TaskInfo.getTaskInfoRecord({
deviceId: this.uav.deviceId,
});
if (res.code === 0) {
this.selectedAirwayId = res.data.reouteId;
}
}
},
beforeDestroy() {
this.showAirwayEdit = false;
......@@ -151,6 +152,15 @@ export default {
"apiPointsToFKZXPoints",
]),
...mapActions("MMCFlightControlCenter/hangar", ["isTakeOver"]),
async getTaskInfoRecord() {
let res = await TaskInfo.getTaskInfoRecord({
deviceId: this.uav && this.uav.deviceId,
});
if (res.code === 0) {
this.selectedAirwayId = res.data.reouteId;
this.selectedTaskId = res.data.taskInfoId;
}
},
/**
* 获取任务列表
*/
......@@ -239,7 +249,7 @@ export default {
task: this.selectedTask,
airway: this.selectedAirway,
});
} catch (e) {}
} catch (e) { }
},
},
};
......@@ -262,35 +272,34 @@ export default {
height: 32px;
background: #3c3c3c;
border-radius: 12px 12px 0px 0px;
.title {
display: flex;
align-items: center;
margin-left: 10px;
.font {
font-size: 20px;
font-family: YouSheBiaoTiHei;
color: #14faff;
line-height: 26px;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background-image: -webkit-linear-gradient(
right,
background-image: -webkit-linear-gradient(right,
#e3aa77,
#f5cda9,
#f9ecd3,
#fcdbb1,
#edb07a
);
#edb07a);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
.active {
background-image: linear-gradient(
180deg,
background-image: linear-gradient(180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.22) 40%,
#05091a 100%
);
#05091a 100%);
border: 1px solid #70daf9;
box-shadow: inset 0 0 10px 2px #3f9dff;
font-family: MicrosoftYaHei-Bold;
......@@ -301,12 +310,10 @@ export default {
}
.default {
background-image: linear-gradient(
180deg,
background-image: linear-gradient(180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.22) 40%,
#05091a 100%
);
#05091a 100%);
border: 1px solid #70daf9;
font-family: MicrosoftYaHei-Bold;
font-size: 14px;
......@@ -315,6 +322,7 @@ export default {
font-weight: 700;
}
}
.task-main::v-deep {
flex: auto;
......@@ -374,9 +382,14 @@ export default {
color: #3388ff;
}
}
.select-airway__btn {
width: 100%;
height: 30px;
padding: 0;
}
::v-deep.el-tooltip__popper {
margin-top: 20px;
}
</style>
......@@ -18,7 +18,7 @@
<template #content>
<div>
{{ item.taskStartTime }}
<div v-if="type == 2">
<div v-if="type == 2 &&item.taskEndTime != '/'">
{{ item.taskEndTime }}
</div>
</div>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论