From 2800fa4f32f3900509cb4d6eefaf2bfaf54efdd7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:29:09 +0800
Subject: [PATCH] fix: 天气显示
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue
index 79e6ca9..c735d0b 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue
@@ -99,10 +99,10 @@
// 获取机巢信息
const wsInfo = inject('wsInfo')
const dockDetails = inject('dockDetails')
-let device_osd_info = computed(() => wsInfo.value?.device_osd || {});
-let device_osd_host = computed(() => device_osd_info?.value?.data?.host || {});
-let dock_osd_info = computed(() => wsInfo.value?.dock_osd || {});
-let dock_osd_host = computed(() => dock_osd_info.value?.data?.host || {});
+let device_osd_info = computed(() => wsInfo.value?.device_osd || {})
+let device_osd_host = computed(() => device_osd_info?.value?.data?.host || {})
+let dock_osd_info = computed(() => wsInfo.value?.dock_osd || {})
+let dock_osd_host = computed(() => dock_osd_info.value?.data?.host || {})
// 单个机巢统计数据
const singleTotal = inject('singleTotal')
// 是否展示机机巢状态详情
@@ -126,7 +126,8 @@
let quality = ref(['弱', '较弱', '中等', '较强', '强'])
// 监听实时信息
-watch(device_osd_host,
+watch(
+ device_osd_host,
newValue => {
if (!newValue) return
if (newValue?.mode_code === 14) return
@@ -156,18 +157,19 @@
// EDeviceTypeName.Dock
// 获取最新机场状态
-watch(wsInfo,
+watch(
+ wsInfo,
() => {
- if (dock_osd_host.value?.mode_code){
- AircraftStatus.value = EModeText?.[dock_osd_host.value?.mode_code] || '--'
+ if (device_osd_host.value?.mode_code !== undefined) {
+ AircraftStatus.value = EModeText?.[device_osd_host.value?.mode_code] || '--'
+ }
+ // 飞机在线时取飞机中的电量
+ if (device_osd_host.value?.battery) {
+ drone_charge_state.value = {
+ capacity_percent: device_osd_host.value.battery.capacity_percent,
+ state: device_osd_host.value.battery.landing_power,
}
- // 飞机在线时取飞机中的电量
- if (device_osd_host.value?.battery) {
- drone_charge_state.value = {
- capacity_percent: device_osd_host.value.battery.capacity_percent,
- state: device_osd_host.value.battery.landing_power,
- }
- }
+ }
if (device_osd_host.value?.mode_code === undefined || device_osd_host.value?.mode_code === 14) {
detailInfo.value = {
longitude: '--',
--
Gitblit v1.9.3