From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/components/basic-container/main.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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..3352271 100644
--- a/applications/drone-command/src/components/basic-container/main.vue
+++ b/applications/drone-command/src/components/basic-container/main.vue
@@ -2,10 +2,10 @@
* @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.
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
* 2025-06-14 15:19:16
-->
<template>
@@ -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