From de1b2a2d4e856fd4769f3d96d8c4f048fe5f9004 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 20 Jan 2026 18:56:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/styles/common/cockpit.scss | 172 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 125 insertions(+), 47 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index a720080..9b8ef08 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;
@@ -568,7 +583,7 @@
font-weight: bold;
font-size: 18px;
color: #FFFFFF;
- line-height: 22px;
+ line-height: 40px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -590,6 +605,8 @@
}
.el-form.command-dialog-history-search {
+ margin-bottom: 20px;
+
.el-form-item {
margin-left: 20px;
}
@@ -652,21 +669,7 @@
}
}
}
-
- .history-search-actions {
- .el-button {
- width: 96px;
- background: transparent !important;
- border-radius: 4px 4px 4px 4px;
- border: 1px solid rgba(255, 255, 255, 0.3);
-
- .el-icon {
- font-size: 16px;
- color: #fff;
- }
- }
- }
-
+
.el-input {
width: 160px;
}
@@ -680,9 +683,17 @@
width: 160px;
}
}
+
+ .history-search-actions {
+ .search-btn {
+ background: #284FE3 !important;
+ }
+ }
}
.command-page-history-search {
+ margin-bottom: 20px;
+
.el-form-item__label {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
@@ -816,16 +827,30 @@
.history-search-actions {
.el-button {
margin-left: 20px;
+ width: 96px;
+ background: transparent !important;
+ border-radius: 4px 4px 4px 4px;
+ border: 1px solid rgba(255, 255, 255, 0.3);
+
+ .el-icon {
+ font-size: 16px;
+ color: #fff;
+ }
&:first-child {
margin-left: 0;
}
}
+
+ .search-btn {
+ background: #1C1C31 !important;
+ border: 1px solid rgba(227, 227, 236, 0.3) !important;
+ }
}
}
.command-table-toolbar {
- margin-top: 30px;
+ margin-bottom: 20px;
.el-button {
min-width: 88px;
@@ -840,8 +865,6 @@
}
.command-table-container {
- margin-top: 20px;
-
height: 0;
flex: 1;
display: flex;
@@ -920,7 +943,7 @@
font-weight: 500;
font-size: 14px;
color: #FFFFFF;
- line-height: 22px;
+ line-height: 40px;
font-style: normal;
text-transform: none;
}
@@ -1042,24 +1065,38 @@
}
.command-page-view-dialog {
- padding: 30px;
+ margin: 0;
+ padding: 20px;
display: flex;
flex-direction: column;
width: 770px;
background: #1A1A2A;
border-radius: 6px 6px 6px 6px;
border: 1px solid #2E2E46;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
.el-dialog__header {
+ padding-bottom: 20px;
+ position: relative;
+
span {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
font-size: 18px;
color: #FFFFFF;
- line-height: 22px;
text-align: left;
font-style: normal;
text-transform: none;
+ }
+
+ & > button {
+ width: auto;
+ height: auto;
+ display: flex;
+ align-items: center;
}
.el-icon {
@@ -1097,7 +1134,6 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1109,7 +1145,6 @@
font-weight: 400;
font-size: 14px;
color: #9E9EBA;
- line-height: 22px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -1122,12 +1157,39 @@
height: 360px;
.command-table-pagination {
+ padding-bottom: 20px;
justify-content: center;
}
}
}
.dialog-form {
+ h3 {
+ margin: 0;
+ margin-bottom: 20px;
+ }
+
+ .detail-title {
+ line-height: 40px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 500;
+ font-size: 16px;
+ color: #FFFFFF;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ }
+
+ .el-row {
+ .el-col {
+ margin-bottom: 0;
+
+ .el-form-item {
+ margin-bottom: 20px;
+ }
+ }
+ }
+
.el-form-item {
display: flex;
align-items: center;
@@ -1139,7 +1201,7 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
+ line-height: 40px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1148,6 +1210,7 @@
.el-form-item__content {
display: flex;
align-items: center;
+ line-height: 40px;
.el-input,
.el-input-number {
@@ -1186,6 +1249,7 @@
}
.el-button {
+ height: 40px;
color: #fff;
background: #2E2E48 !important;
border: none;
@@ -1246,6 +1310,7 @@
}
.el-dialog__footer {
+ padding-top: 0;
display: flex;
justify-content: center;
@@ -1272,7 +1337,7 @@
font-weight: bold;
font-size: 18px;
color: #FFFFFF;
- line-height: 22px;
+ line-height: 40px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -1311,7 +1376,9 @@
}
.command-page-map-view-dialog {
- padding: 30px;
+ margin: 0;
+
+ padding: 20px;
display: flex;
flex-direction: column;
width: 80%;
@@ -1319,6 +1386,11 @@
background: #1A1A2A;
border-radius: 6px 6px 6px 6px;
border: 1px solid #2E2E46;
+
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
.el-dialog__header,
.el-dialog__footer {
@@ -1361,8 +1433,11 @@
height: 100%;
.header {
- padding: 0 16px;
- padding-bottom: 16px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding-left: 16px;
+ padding-bottom: 20px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 18px;
@@ -1370,17 +1445,23 @@
text-align: left;
font-style: normal;
text-transform: none;
+
+ .el-icon {
+ cursor: pointer;
+ }
}
- .dialog-container {
- padding: 0 16px;
+ .content {
height: 0;
flex: 1;
+ padding: 0 16px;
display: flex;
flex-direction: column;
+ overflow-y: auto;
+
.detail-title {
- margin-bottom: 20px;
+ line-height: 40px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 16px;
@@ -1402,7 +1483,6 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1425,6 +1505,7 @@
.command-table-container {
+ height: auto;
margin-top: 0;
margin-bottom: 20px;
@@ -1441,6 +1522,14 @@
display: flex;
flex-direction: column;
+ overflow-y: auto;
+
+ .el-row {
+ .el-col {
+ margin-bottom: 0;
+ }
+ }
+
.el-form-item {
display: flex;
align-items: center;
@@ -1452,7 +1541,7 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
+ line-height: 40px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1461,6 +1550,7 @@
.el-form-item__content {
display: flex;
align-items: center;
+ line-height: 40px;
.el-input,
.el-input-number {
@@ -1548,8 +1638,6 @@
}
.search-table-container {
- height: 0;
- flex: 1;
display: flex;
flex-direction: column;
@@ -1590,21 +1678,11 @@
}
.el-form-item {
- height: 0;
- flex: 1;
- display: flex;
- flex-direction: column;
-
.el-form-item__content {
width: 100%;
- height: 0;
- flex: 1;
- display: flex;
- flex-direction: column;
.el-table {
- height: 0;
- flex: 1;
+ height: auto;
}
}
}
--
Gitblit v1.9.3