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/RightContainer.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue b/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue
index 7a4cfcb..5cd84d9 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-09 16:54:31
+ * @LastEditTime : 2026-01-20 09:19:16
* @FilePath : \applications\drone-command\src\views\dataCockpit\components\RightContainer.vue
* @Description :
* Copyright 2026 OBKoro1, All Rights Reserved.
@@ -94,7 +94,7 @@
const historyVisible = ref(false)
const historyDevice = ref(null)
-const loading = ref(false)
+const loading = ref(true)
const minLoadingMs = 400
const onHistory = (item) => {
@@ -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
@@ -232,7 +233,7 @@
.val {
margin-top: 10px;
- font-family: DIN, DIN;
+ font-family: DinAB;
font-weight: bold;
font-size: 22px;
color: #FFFFFF;
@@ -259,25 +260,25 @@
position: relative;
&.collapsed {
- transform: translateX(100%);
+ transform: translateX(calc(100% + 17px + 32px));
}
}
.collapse-btn {
position: absolute;
- top: 50%;
- right: 357px;
+ bottom: 454px;
+ right: 300px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
color: #fff;
z-index: 10;
- transform: translateY(-50%);
+ transform: translateY(50%);
.arrow {
- width: 24px;
- height: 24px;
+ width: 36px;
+ height: 36px;
background: url('@/assets/images/dataCockpit/right-btn.png') center / 100% 100% no-repeat;
}
--
Gitblit v1.9.3