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 | 34 ++++++++++++++++++++++++----------
1 files changed, 24 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 494cd94..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,9 +1,17 @@
<template>
<div class="drone-info-card" @click="emit('click', data)">
<div class="title">
- <span class="name">
- {{ data.droneName }}
- </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">
@@ -25,8 +33,7 @@
<div class="row">
<span class="label">发现时间</span>
<span class="value">
- <span class="date">{{ getAlarmDate(data.alarmTime) }}</span>
- <span class="time">{{ getAlarmTime(data.alarmTime) }}</span>
+ {{ data.alarmTime }}
</span>
</div>
@@ -38,11 +45,6 @@
<div class="row">
<span class="label">反制方式</span>
<span class="value">{{ getCounterWayText(data.counterWay) }}</span>
- </div>
-
- <div class="row">
- <span class="label">飞行状态</span>
- <span class="value">{{ getFlightStatusText(data.flightStatus) }}</span>
</div>
</div>
</div>
@@ -110,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;
@@ -119,6 +130,9 @@
text-align: left;
font-style: normal;
text-transform: none;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
--
Gitblit v1.9.3