From f925f12d5263c94644bddf6fd2ac3d23b77791cf Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 19 Jan 2026 14:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue b/applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue
index 07b66eb..01b7231 100644
--- a/applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue
@@ -107,30 +107,25 @@
 	transition: transform 0.3s ease-in-out;
 
 	&.collapsed {
-		transform: translateX(-100%);
+		transform: translateX(calc(-100% - 17px - 32px));
 	}
 }
 
 .collapse-btn {
 	position: absolute;
-	top: 50%;
-	left: 357px;
-	background: rgba(17, 23, 34, 0.8);
-	border: 1px solid #333355;
-	border-left: none;
-	border-radius: 0 4px 4px 0;
+	bottom: 454px;
+	left: 300px;
 	cursor: pointer;
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	color: #fff;
 	z-index: 10;
-	backdrop-filter: blur(5px);
-	transform: translateY(-50%);
+	transform: translateY(50%);
 
 	.arrow {
-		width: 24px;
-		height: 24px;
+		width: 36px;
+		height: 36px;
 		background: url('@/assets/images/dataCockpit/left-btn.png') center / 100% 100% no-repeat;
 	}
 
@@ -140,8 +135,19 @@
 }
 
 .category-container {
+	position: relative;
 	display: flex;
 	justify-content: space-between;
+
+	&::after {
+		content: '';
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 1px;
+		background: #333355;
+	}
 
 	.category-item {
 		position: relative;
@@ -175,8 +181,7 @@
 			left: 0;
 			bottom: 0;
 			width: 100%;
-			height: 1px;
-			background: #333355;
+			height: 0;
 		}
 
 		&.active::after {
@@ -184,6 +189,7 @@
 			background: #284FE3;
 			box-shadow: 0px 3px 2px 0px rgba(15, 89, 255, 0.1), 0px 7px 5px 0px rgba(15, 89, 255, 0.15), 0px 13px 10px 0px rgba(15, 89, 255, 0.18), 0px 22px 18px 0px rgba(15, 89, 255, 0.21), 0px 42px 33px 0px rgba(15, 89, 255, 0.26), 0px 100px 80px 0px rgba(15, 89, 255, 0.36);
 			border-radius: 5px 5px 0px 0px;
+			z-index: 9;
 		}
 
 		.badge {
@@ -207,7 +213,6 @@
 	height: 0;
 	flex: 1;
 	margin-top: 20px;
-	overflow-x: hidden;
-	overflow-y: auto;
+	overflow: hidden;
 }
 </style>

--
Gitblit v1.9.3