From 5cc6602cd5fbe761025149bc5dfaefae4f1adcea Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 19 Jan 2026 17:02:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue | 2 +-
applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue | 2 +-
applications/drone-command/src/styles/common/cockpit.scss | 32 ++++++++++++++++++++++++++++++--
applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue | 2 +-
applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue | 2 +-
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 2 +-
6 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index 6a69422..4735e89 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -104,6 +104,10 @@
}
}
+.command-input.el-textarea {
+ height: auto;
+}
+
.command-date-picker {
height: 40px !important;
box-shadow: none !important;
@@ -385,6 +389,7 @@
}
.command-select-popper.el-select__popper {
+ min-height: 186px;
border: none;
background: #2E2E48 !important;
@@ -473,6 +478,16 @@
.command-tree-select-popper {
background: #2E2E48 !important;
border: none !important;
+
+ .el-scrollbar {
+
+ .el-scrollbar__wrap {
+
+ .el-select-dropdown__list {
+ min-height: 186px;
+ }
+ }
+ }
.el-popper__arrow::before {
background: #2E2E48 !important;
@@ -1128,6 +1143,12 @@
}
.dialog-form {
+ .el-row {
+ .el-col {
+ margin-bottom: 0;
+ }
+ }
+
.el-form-item {
display: flex;
align-items: center;
@@ -1187,6 +1208,7 @@
}
.el-button {
+ height: 40px;
color: #fff;
background: #2E2E48 !important;
border: none;
@@ -1373,7 +1395,7 @@
text-transform: none;
}
- .dialog-container {
+ .content {
height: 0;
flex: 1;
padding: 0 16px;
@@ -1395,7 +1417,7 @@
.el-row {
.el-col {
- margin-bottom: 20px;
+ margin-bottom: 0;
display: flex;
align-items: center;
@@ -1447,6 +1469,12 @@
overflow-y: auto;
+ .el-row {
+ .el-col {
+ margin-bottom: 0;
+ }
+ }
+
.el-form-item {
display: flex;
align-items: center;
diff --git a/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
index 6a22896..de0dbb3 100644
--- a/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
@@ -18,7 +18,7 @@
{{ titleEnum[dialogMode] }}
</div>
- <div class="dialog-container" v-if="readonly">
+ <div class="content" v-if="readonly">
<div class="detail-title">防区详情</div>
<el-row>
<el-col :span="24">
diff --git a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
index d626857..70857dd 100644
--- a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
@@ -19,7 +19,7 @@
{{ titleEnum[dialogMode] }}
</div>
- <div class="dialog-container" v-if="readonly">
+ <div class="content" v-if="readonly">
<div class="detail-title">区域详情</div>
<el-row>
<el-col :span="24">
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index d90014d..86ccc50 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -17,7 +17,7 @@
{{ titleEnum[dialogMode] }}
</div>
- <div class="dialog-container" v-if="readonly">
+ <div class="content" v-if="readonly">
<div class="detail-title">场景详情</div>
<el-row>
<el-col :span="24">
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
index 457bf65..f18f74c 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
@@ -23,7 +23,7 @@
<div class="right-container">
<div class="header">{{ formTitle }}</div>
- <div class="dialog-container" v-if="dialogReadonly">
+ <div class="content" v-if="dialogReadonly">
<el-row>
<el-col :span="24">
<div class="label">侦测设备</div>
diff --git a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
index 5664834..0836897 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
+++ b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
@@ -13,7 +13,7 @@
</div>
<div class="right-container">
<div class="header">{{ dialogTitle }}</div>
- <div class="dialog-container">
+ <div class="content">
<div class="detail-title">轨迹信息</div>
<el-row>
<el-col :span="24">
--
Gitblit v1.9.3