From 566317f859765cab003351602a35a90e93c557e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 19 Jan 2026 14:41:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/RightContainer.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue b/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue
index 1fa333e..fb146b5 100644
--- a/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue
@@ -2,7 +2,7 @@
* @Author : yuan
* @Date : 2026-01-07 15:17:54
* @LastEditors : yuan
- * @LastEditTime : 2026-01-16 17:23:06
+ * @LastEditTime : 2026-01-19 14:05:35
* @FilePath : \applications\drone-command\src\views\dataCockpit\components\RightContainer.vue
* @Description :
* Copyright 2026 OBKoro1, All Rights Reserved.
@@ -134,6 +134,7 @@
azimuth: item.azimuth ?? 0,
elevation: item.elevation ?? 0,
status: item.status ?? '-',
+ workMode: item.workMode ?? '-',
manufacturer: item.manufacturer || '-',
detectTargetCnt: item.detectTargetCnt ?? 0,
effectiveRangeKm: item.effectiveRangeKm ?? 0
@@ -265,7 +266,7 @@
.collapse-btn {
position: absolute;
- top: 50%;
+ bottom: 454px;
right: 300px;
cursor: pointer;
display: flex;
@@ -273,11 +274,11 @@
justify-content: center;
color: #fff;
z-index: 10;
- transform: translateY(-50%);
+ transform: translateY(50%);
.arrow {
- width: 32px;
- height: 32px;
+ width: 36px;
+ height: 36px;
background: url('@/assets/images/dataCockpit/right-btn.png') center / 100% 100% no-repeat;
}
--
Gitblit v1.9.3