From d07c8e0b866dfadd65f12cbe3c9c74c800b0619a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 09 Jan 2026 16:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/templateComponents/RealEquipmentTemplate.vue | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealEquipmentTemplate.vue b/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealEquipmentTemplate.vue
index 2cf3cc7..ed08cbf 100644
--- a/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealEquipmentTemplate.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealEquipmentTemplate.vue
@@ -6,12 +6,12 @@
<span class="name">{{ data.name }}</span>
<span class="status">
- <span :class="data.actionType">
+ <span :class="getStatusType(data.status)">
</span>
<span>
- {{ data.actionText }}
+ {{ getStatusText(data.status) }}
</span>
</span>
</div>
@@ -26,7 +26,7 @@
</div>
<div class="col">
<span class="label">电量</span>
- {{ data.battery }}%
+ {{ data.batteryPct }}%
</div>
</div>
@@ -37,29 +37,29 @@
</div>
<div class="col">
<span class="label">俯仰角</span>
- {{ data.pitch }}°
+ {{ data.elevation }}°
</div>
</div>
<div class="row">
<div class="col">
<span class="label">状态</span>
- {{ data.statusText }}
+ {{ getStatusText(data.status) }}
</div>
<div class="col">
<span class="label">厂商</span>
- {{ data.vendor }}
+ {{ data.manufacturer }}
</div>
</div>
<div class="row">
<div class="col">
<span class="label">侦测目标</span>
- {{ data.targetCount }}台
+ {{ data.detectTargetCnt }}台
</div>
<div class="col">
<span class="label">有效范围</span>
- {{ data.range }}KM
+ {{ data.effectiveRangeKm }}KM
</div>
</div>
</div>
@@ -81,6 +81,20 @@
})
const emit = defineEmits(['history', 'click'])
+
+const getStatusText = (value) => {
+ if (value === 0 || value === '0') return '在线'
+ if (value === 1 || value === '1') return '离线'
+ if (value === 2 || value === '2') return '故障'
+ if (value === 3 || value === '3') return '报废'
+ return value || '-'
+}
+
+const getStatusType = (value) => {
+ if (value === 0 || value === '0') return 'detecting'
+ if (value === 2 || value === '2') return 'jamming'
+ return ''
+}
</script>
<style scoped lang="scss">
@@ -196,4 +210,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3