From 46f71f1985eabbf84926d6416659370f1e8c8c3e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 14 Jan 2026 11:39:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/components/basic-container/main.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/src/components/basic-container/main.vue b/applications/drone-command/src/components/basic-container/main.vue
index 43459d6..735b458 100644
--- a/applications/drone-command/src/components/basic-container/main.vue
+++ b/applications/drone-command/src/components/basic-container/main.vue
@@ -2,7 +2,7 @@
* @Author : yuan
* @Date : 2025-06-14 15:19:16
* @LastEditors : yuan
- * @LastEditTime : 2026-01-07 16:26:20
+ * @LastEditTime : 2026-01-14 10:10:35
* @FilePath : \applications\drone-command\src\components\basic-container\main.vue
* @Description :
* Copyright 2025 OBKoro1, All Rights Reserved.
@@ -50,25 +50,26 @@
height: 0;
flex: 1;
- padding: 30px;
+ padding: 6px 30px;
// box-sizing: border-box;
// height: 100%;
.basic-container__card {
+ display: flex;
+ flex-direction: column;
height: 100% !important;
overflow: hidden;
+ background: transparent;
- .el-card__body {
+ ::v-deep(.el-card__body) {
+ padding: 0 !important;
+ height: 0 !important;
+ flex: 1 !important;
display: flex;
flex-direction: column;
- height: 100% !important;
+
overflow: hidden;
box-sizing: border-box;
-
- &>div {
- height: 0;
- flex: 1;
- }
}
}
--
Gitblit v1.9.3