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 | 149 +++++++++++++++++++++++++++++++++----------------
1 files changed, 101 insertions(+), 48 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index cbab13d..9b8ef08 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -683,6 +683,12 @@
width: 160px;
}
}
+
+ .history-search-actions {
+ .search-btn {
+ background: #284FE3 !important;
+ }
+ }
}
.command-page-history-search {
@@ -1059,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: 40px;
text-align: left;
font-style: normal;
text-transform: none;
+ }
+
+ & > button {
+ width: auto;
+ height: auto;
+ display: flex;
+ align-items: center;
}
.el-icon {
@@ -1092,6 +1112,64 @@
padding: 0 10px;
.detail-title {
+ margin-bottom: 20px;
+ 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: 20px;
+ display: flex;
+ align-items: center;
+
+ .label {
+ width: 88px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 500;
+ font-size: 14px;
+ color: #D4D5D7;
+ text-align: right;
+ font-style: normal;
+ text-transform: none;
+ }
+
+ .val {
+ margin-left: 12px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #9E9EBA;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ }
+ }
+ }
+
+
+ .command-table-container {
+ 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;
@@ -1105,49 +1183,10 @@
.el-row {
.el-col {
margin-bottom: 0;
- display: flex;
- align-items: center;
- .label {
- width: 88px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 14px;
- color: #D4D5D7;
- line-height: 40px;
- text-align: right;
- font-style: normal;
- text-transform: none;
+ .el-form-item {
+ margin-bottom: 20px;
}
-
- .val {
- margin-left: 12px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 14px;
- color: #9E9EBA;
- line-height: 40px;
- text-align: left;
- font-style: normal;
- text-transform: none;
- }
- }
- }
-
-
- .command-table-container {
- height: 360px;
-
- .command-table-pagination {
- justify-content: center;
- }
- }
- }
-
- .dialog-form {
- .el-row {
- .el-col {
- margin-bottom: 0;
}
}
@@ -1271,6 +1310,7 @@
}
.el-dialog__footer {
+ padding-top: 0;
display: flex;
justify-content: center;
@@ -1336,7 +1376,9 @@
}
.command-page-map-view-dialog {
- padding: 30px;
+ margin: 0;
+
+ padding: 20px;
display: flex;
flex-direction: column;
width: 80%;
@@ -1344,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 {
@@ -1386,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;
@@ -1395,6 +1445,10 @@
text-align: left;
font-style: normal;
text-transform: none;
+
+ .el-icon {
+ cursor: pointer;
+ }
}
.content {
@@ -1419,7 +1473,7 @@
.el-row {
.el-col {
- margin-bottom: 0;
+ margin-bottom: 20px;
display: flex;
align-items: center;
@@ -1429,7 +1483,6 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 40px;
text-align: right;
font-style: normal;
text-transform: none;
--
Gitblit v1.9.3