From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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 d29d7b4..2019774 100644
--- a/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue
@@ -2,7 +2,15 @@
<div class="drone-card">
<div class="header">
<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>
<span class="status">
<span :class="getStatusType(data)">
@@ -90,6 +98,21 @@
return 'detecting'
}
+const normalizeCounterWay = (value) => {
+ if (value == null) return ''
+ return String(value).trim()
+}
+
+const showSignalBtn = (item) => {
+ const counterWay = normalizeCounterWay(item?.counterWay)
+ return counterWay !== '1'
+}
+
+const showCounterBtn = (item) => {
+ const counterWay = normalizeCounterWay(item?.counterWay)
+ return counterWay !== '2'
+}
+
const getDataSource = (item) => {
return item?.deviceName || item?.areaName || '-'
}
@@ -142,8 +165,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;
@@ -151,9 +183,13 @@
text-align: left;
font-style: normal;
text-transform: none;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.status {
+ flex-shrink: 0;
padding: 0 10px;
display: flex;
align-items: center;
--
Gitblit v1.9.3