From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/dataCockpit/components/templateComponents/HistoryTemplate.vue | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/templateComponents/HistoryTemplate.vue b/applications/drone-command/src/views/dataCockpit/components/templateComponents/HistoryTemplate.vue
index b1bdf9d..22b5bdd 100644
--- a/applications/drone-command/src/views/dataCockpit/components/templateComponents/HistoryTemplate.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/templateComponents/HistoryTemplate.vue
@@ -1,43 +1,50 @@
<template>
<div class="drone-info-card" @click="emit('click', data)">
<div class="title">
- <span class="name">
- {{ data.name }}
- </span>
+ <el-tooltip
+ class="title-tooltip"
+ :content="data.droneName || '-'"
+ placement="top"
+ effect="dark"
+ :show-after="200"
+ >
+ <span class="name">
+ {{ data.droneName }}
+ </span>
+ </el-tooltip>
</div>
<div class="rows">
<div class="row">
<span class="label">序列号</span>
- <span class="value">{{ data.serialNumber }}</span>
+ <span class="value">{{ data.droneSerialNo }}</span>
</div>
<div class="row">
<span class="label">数据源</span>
- <span class="value">{{ data.dataSource }}</span>
+ <span class="value">{{ getDataSource(data) }}</span>
</div>
<div class="row">
<span class="label">信号频段</span>
- <span class="value">{{ data.frequency }}</span>
+ <span class="value">{{ formatFrequency(data.signalFreqMhz) }}</span>
</div>
<div class="row">
<span class="label">发现时间</span>
<span class="value">
- <span class="date">{{ data.discoveredAt?.date }}</span>
- <span class="time">{{ data.discoveredAt?.time }}</span>
+ {{ data.alarmTime }}
</span>
</div>
<div class="row">
<span class="label">停留时间</span>
- <span class="value">{{ data.stayTime }}</span>
+ <span class="value">{{ data.stayDuration }}</span>
</div>
<div class="row">
<span class="label">反制方式</span>
- <span class="value">{{ data.counterMethod }}</span>
+ <span class="value">{{ getCounterWayText(data.counterWay) }}</span>
</div>
</div>
</div>
@@ -53,6 +60,40 @@
})
const emit = defineEmits(['click'])
+
+const getDataSource = (item) => {
+ return item?.deviceName || item?.areaName || '-'
+}
+
+const formatFrequency = (value) => {
+ if (value == null || value === '') return '-'
+ return `${value}MHZ`
+}
+
+const getAlarmDate = (value) => {
+ if (!value) return '-'
+ const parts = value.replace('T', ' ').split(' ')
+ return parts[0] || value
+}
+
+const getAlarmTime = (value) => {
+ if (!value) return '-'
+ const parts = value.replace('T', ' ').split(' ')
+ return parts[1] || value
+}
+
+const getFlightStatusText = (value) => {
+ if (value === 1 || value === '1') return '侦测中'
+ if (value === 2 || value === '2') return '反制中'
+ return value || '-'
+}
+
+const getCounterWayText = (value) => {
+ if (value === 1 || value === '1') return '信号干扰'
+ if (value === 2 || value === '2') return '诱导驱离'
+ if (value === 3 || value === '3') return '无'
+ return value || '-'
+}
</script>
<style scoped lang="scss">
@@ -71,8 +112,17 @@
display: flex;
align-items: center;
gap: 6px;
+ min-width: 0;
+
+ .title-tooltip {
+ flex: 1;
+ min-width: 0;
+ display: block;
+ }
.name {
+ display: inline-block;
+ max-width: 100%;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
font-size: 14px;
@@ -80,6 +130,9 @@
text-align: left;
font-style: normal;
text-transform: none;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
--
Gitblit v1.9.3