提交 45f0968c 作者: 温凯

fix:接管无人机接口更改

上级 7d9ec497
...@@ -49,7 +49,7 @@ class Control_API { ...@@ -49,7 +49,7 @@ class Control_API {
// 接管无人机 // 接管无人机
static setUavControlOn(params) { static setUavControlOn(params) {
return request({ return request({
url: `/admin-api/uas/device-take/controlUav`, url: `/admin-api/uas/device-take/updateCurrentOperator`,
method: 'post', method: 'post',
params params
}); });
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<ControlList @clearId="$emit('clearId')" @closeIconShow="iconShow = false" @exit="showControlList = false" <ControlList @clearId="$emit('clearId')" @closeIconShow="iconShow = false" @exit="showControlList = false"
:show="showControlList" :isHangar="isHangar"></ControlList> :show="showControlList" :isHangar="isHangar"></ControlList>
<Health v-if="showHealth" @exit="showHealth = false"></Health> <Health v-if="showHealth" @exit="showHealth = false"></Health>
<Mount v-if="showMount" :isHangar="isHangar" :show="showMount"></Mount> <Mount v-if="showMount" :isHangar="isHangar" :show="showMount"></Mount>
<!-- 喊话器 --> <!-- 喊话器 -->
<MMCGimbalP1 class="PagerP1" v-show="showMMCGimbalP1" ref="MMCGimbalP1" @close="showMMCGimbalP1 = false" /> <MMCGimbalP1 class="PagerP1" v-show="showMMCGimbalP1" ref="MMCGimbalP1" @close="showMMCGimbalP1 = false" />
<MountController @webscoketFn="(data) => fun(data)" v-if="uav && uav.deviceId" ref="MountControllerRef" /> <MountController @webscoketFn="(data) => fun(data)" v-if="uav && uav.deviceId" ref="MountControllerRef" />
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
}, },
computed: { computed: {
...mapState("MMCFlightControlCenter", ["showAirwayEdit"]), ...mapState("MMCFlightControlCenter", ["showAirwayEdit"]),
...mapState("MMCFlightControlCenter/uav", ["uav", "airlineData"]), ...mapState("MMCFlightControlCenter/uav", ["uav", "airlineData",'uavRealTimeData']),
}, },
watch: { watch: {
// 打开航线编辑时关闭所有窗口 // 打开航线编辑时关闭所有窗口
...@@ -96,6 +96,23 @@ export default { ...@@ -96,6 +96,23 @@ export default {
} }
}, },
methods: { methods: {
network() {
let { uavRealTimeData } = this;
let name = null;
if (uavRealTimeData && uavRealTimeData.link) {
for (let i = 0; i < uavRealTimeData.link.length; i++) {
const k = uavRealTimeData.link[i];
if (k.priority == 2 && k.using) {
return "专网";
} else if (k.priority == 3 && k.using) {
return "公网";
} else if (k.priority == 1 && k.using) {
return "图传";
}
}
}
return name || "离线";
},
/** /**
* 接管判断, 机库模块中不需要判断接管 * 接管判断, 机库模块中不需要判断接管
*/ */
...@@ -128,8 +145,9 @@ export default { ...@@ -128,8 +145,9 @@ export default {
/** /**
* 切换展示 * 切换展示
*/ */
async onSwitchShow(key) { async onSwitchShow(key) {
if (key == 'showHealth' && !this?.uav?.isOnline) { let networkType = this.network()
if (key == 'showHealth' && networkType == '离线') {
return this.$message.info('无人机不在线!'); return this.$message.info('无人机不在线!');
} }
// 判断是否已接管 // 判断是否已接管
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<img :src="gpsImg" /> <img :src="gpsImg" />
</el-tooltip> </el-tooltip>
<!-- 搜星数 --> <!-- 搜星数 -->
<el-tooltip class="item" effect="dark" content="搜星数" placement="bottom"> <el-tooltip class="item " effect="dark" content="搜星数" placement="bottom">
<div> <div>
<img src="./assets/images/satellite.png" /> <img src="./assets/images/satellite.png" />
<div class="s-count">{{ satelliteCount }}</div> <div class="s-count">{{ satelliteCount }}</div>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论