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/EquipmentTemplate.vue | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue b/applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue
index 2310b82..7b09cfb 100644
--- a/applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue
@@ -2,7 +2,15 @@
<div class="device-card" @click="emit('click', data)">
<div class="header">
<div class="title">
- <span class="name">{{ data.name }}</span>
+ <el-tooltip
+ class="title-tooltip"
+ :content="data.name || '-'"
+ placement="top"
+ effect="dark"
+ :show-after="200"
+ >
+ <span class="name">{{ data.name }}</span>
+ </el-tooltip>
<span class="status">
<span :class="data.statusType">
@@ -24,7 +32,7 @@
</div>
<div class="col">
<span class="label">厂商</span>
- {{ data.vendor }}
+ {{ data.manufacturer }}
</div>
</div>
<div class="row">
@@ -89,8 +97,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;
@@ -98,9 +115,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