From bcfa7fec8c6d2d222989e34f01b5fd6300befaf8 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 23 Jan 2026 15:26:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 06b6695..79119bf 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,10 @@
<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)">
@@ -57,13 +60,16 @@
</div>
<div class="footer">
- <el-button v-if="showSignalBtn(data)" class="general" color="#2B2B4C" @click="emit('signal')">信号干扰</el-button>
- <el-button v-if="showCounterBtn(data)" color="#284FE3" type="primary" @click="emit('counter')">诱导驱离</el-button>
+ <el-button class="general" color="#2B2B4C" @click="handleSignal">信号干扰</el-button>
+ <el-button color="#284FE3" type="primary" @click="handleCounter">诱导驱离</el-button>
</div>
</div>
</template>
<script setup>
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
+
const props = defineProps({
data: {
type: Object,
@@ -72,7 +78,27 @@
}
})
+const route = useRoute()
const emit = defineEmits(['signal', 'counter', 'favorite'])
+
+// 信号干扰操作
+const handleSignal = () => {
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '数据驾驶舱'}-信号干扰`,
+ type: 1
+ })
+ emit('signal')
+}
+
+const handleCounter = () => {
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '数据驾驶舱'}-诱导驱离`,
+ type: 1
+ })
+ emit('counter')
+}
const getStatusText = (item) => {
const status = item?.flightStatus
@@ -157,8 +183,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;
@@ -166,9 +201,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;
@@ -257,4 +296,4 @@
}
}
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3