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/RealTemplate.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue b/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue
index f96a28b..d29d7b4 100644
--- a/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue
@@ -2,14 +2,14 @@
<div class="drone-card">
<div class="header">
<div class="title">
- <span class="name">{{ data.name }}</span>
+ <span class="name">{{ data.droneName }}</span>
<span class="status">
- <span :class="data.statusType">
+ <span :class="getStatusType(data)">
</span>
<span>
- {{ data.status }}
+ {{ getStatusText(data) }}
</span>
</span>
</div>
@@ -24,11 +24,11 @@
<div class="content">
<div>
<span class="label">序列号</span>
- {{ data.serialNumber }}
+ {{ data.droneSerialNo }}
</div>
<div>
<span class="label">数据源</span>
- {{ data.dataSource }}
+ {{ getDataSource(data) }}
</div>
<div>
<span class="label">经纬度</span>
@@ -37,21 +37,21 @@
<div class="row">
<div class="col">
<span class="label">信号频段</span>
- {{ data.frequency }}
+ {{ formatFrequency(data.signalFreqMhz) }}
</div>
<div class="col">
<span class="label">发现时间</span>
- {{ data.discoverTime }}
+ {{ getAlarmTime(data.alarmTime) }}
</div>
</div>
<div class="row">
<div class="col">
<span class="label">飞行高度</span>
- {{ data.altitude }}
+ {{ formatHeight(data.flightHeightM) }}
</div>
<div class="col">
<span class="label">飞行速度</span>
- {{ data.speed }}
+ {{ formatSpeed(data.flightSpeedMs) }}
</div>
</div>
</div>
@@ -73,6 +73,47 @@
})
const emit = defineEmits(['signal', 'counter', 'favorite'])
+
+const getStatusText = (item) => {
+ const status = item?.flightStatus
+ if (status === 1 || status === '1') return '侦测中'
+ if (status === 2 || status === '2') return '反制中'
+ return status || '侦测中'
+}
+
+const getStatusType = (item) => {
+ const statusText = getStatusText(item)
+ const counterWay = item?.counterWay
+ if (statusText.includes('反制') || counterWay === 2 || counterWay === '2' || counterWay === '诱导驱离') {
+ return 'countering'
+ }
+ return 'detecting'
+}
+
+const getDataSource = (item) => {
+ return item?.deviceName || item?.areaName || '-'
+}
+
+const formatFrequency = (value) => {
+ if (value == null || value === '') return '-'
+ return `${value}MHz`
+}
+
+const getAlarmTime = (value) => {
+ if (!value) return '-'
+ const parts = value.replace('T', ' ').split(' ')
+ return parts[1] || value
+}
+
+const formatHeight = (value) => {
+ if (value == null || value === '') return '-'
+ return `${value}m`
+}
+
+const formatSpeed = (value) => {
+ if (value == null || value === '') return '-'
+ return `${value}m/s`
+}
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3