From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/styles/common/cockpit.scss | 466 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 311 insertions(+), 155 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index a720080..43bcd17 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -39,6 +39,49 @@
.command-radio-group {
height: 40px;
+}
+
+.command-cascader {
+ height: 40px;
+
+ .el-input {
+ height: 40px;
+ }
+
+ .el-input__wrapper {
+ --el-input-text-color: #161B2C !important;
+ }
+}
+
+.command-cascader-popper.el-cascader__dropdown {
+ border: none;
+ background: #2E2E48 !important;
+
+ .el-cascader-panel {
+
+ .el-cascader-menu {
+ color: #fff;
+
+ .el-cascader-node:hover,
+ .el-cascader-node:focus {
+ background: transparent !important;
+ }
+
+ .el-cascader-node.is-selectable.in-active-path {
+ color: #fff;
+ }
+ }
+
+ }
+
+ .el-popper__arrow::before {
+ background: #2E2E48 !important;
+ border: 1px solid #2E2E48 !important;
+ }
+}
+
+.command-cascader-popper,
+.command-radio-group {
.el-radio {
.el-radio__input {
@@ -104,6 +147,10 @@
}
}
+.command-input.el-textarea {
+ height: auto;
+}
+
.command-date-picker {
height: 40px !important;
box-shadow: none !important;
@@ -135,7 +182,7 @@
}
.command-date-picker-popper {
- background: #161B2C !important;
+ background: #2E2E48 !important;
border: none !important;
border-radius: 0px 0px 8px 8px;
@@ -153,10 +200,46 @@
.el-picker-panel {
.el-picker-panel__body-wrapper {
.el-picker-panel__body {
- background: #161B2C !important;
+ background: #2E2E48 !important;
color: #fff !important;
.el-date-range-picker__time-header {
+ .el-time-panel {
+ background: #1A1A2A !important;
+ border-radius: 0px 0px 8px 8px;
+ border: none !important;
+
+ // 将 time-picker-popper 的样式移到这里
+ .el-time-panel__header {
+ background: #161B2C !important;
+ color: #ffffff !important;
+ border-bottom: 1px solid rgba(71, 157, 255, 0.3) !important;
+ }
+
+ .el-time-panel__content {
+ .el-time-spinner__item {
+ &:hover {
+ background: transparent !important;
+ }
+
+ &.active {
+ color: #479dff !important;
+ font-weight: bold;
+ }
+ }
+ }
+
+ .el-time-panel__footer {
+ .el-time-panel__btn {
+ color: #fff;
+ }
+
+ .el-time-panel__btn:first-child {
+ color: #86909C;
+ }
+ }
+ }
+
.el-input__wrapper {
box-shadow: none;
background: #2E2E48 !important;
@@ -168,10 +251,9 @@
.el-date-picker__editor-wrap {
.el-time-panel {
- background: #161B2C !important;
+ background: #1A1A2A !important;
border-radius: 0px 0px 8px 8px;
- border: 1px solid !important;
- border-image: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(115, 192, 255, 1)) 1 1 !important;
+ border: none !important;
// 将 time-picker-popper 的样式移到这里
.el-time-panel__header {
@@ -182,10 +264,8 @@
.el-time-panel__content {
.el-time-spinner__item {
- color: #e6e6e6 !important;
-
&:hover {
- background: rgba(71, 157, 255, 0.3) !important;
+ background: transparent !important;
}
&.active {
@@ -196,25 +276,20 @@
}
.el-time-panel__footer {
- background: #161B2C !important;
- border-top: 1px solid rgba(71, 157, 255, 0.3) !important;
-
- .el-button {
- color: #fff !important;
-
- &:hover {
- color: #479dff !important;
- }
+ .el-time-panel__btn {
+ color: #fff;
}
-
- .el-time-panel__btn.cancel {
- color: #fff !important;
-
- &:hover {
- color: #fff !important;
- }
+
+ .el-time-panel__btn:first-child {
+ color: #86909C;
}
}
+ }
+
+ .el-input__wrapper {
+ height: 28px;
+ background: #1A1A2A;
+ box-shadow: none;
}
}
}
@@ -248,7 +323,7 @@
}
td.disabled div {
- background-color: #00193b !important;
+ background-color: #1A1A2A !important;
color: #505050 !important;
cursor: not-allowed;
}
@@ -265,11 +340,17 @@
background-color: #161B2C !important;
}
+ td.current:not(.disabled) {
+ .el-date-table-cell__text {
+ background-color: #284FE3;
+ }
+ }
+
td.in-range div,
td.in-range div:hover,
&.is-week-mode .el-date-table__row.current div,
&.is-week-mode .el-date-table__row:hover div {
- background-color: rgba(60, 121, 202) !important;
+ background-color: #4160D5 !important;
}
}
}
@@ -279,8 +360,8 @@
.el-popper__arrow {
&::before {
- background: #161B2C !important;
- border: 1px solid #161B2C !important;
+ background: #2E2E48 !important;
+ border: 1px solid #2E2E48 !important;
box-sizing: border-box;
}
}
@@ -322,21 +403,53 @@
}
.el-picker-panel__footer {
- background: #161B2C;
+ background: #2E2E48;
color: #fff;
border-top: none;
.el-button--small {
- box-shadow: 0 0 0 0.1rem#409eff;
- background-color: #161B2C;
color: #fff;
- border: none;
+ border: 1px solid rgba(255, 255, 255, 0.3);
+ box-shadow: none;
+ background-color: transparent !important;
&:hover {
- background-color: #161B2C;
color: #fff;
- border-color: #409eff;
+ border-color: none;
+ background-color: transparent !important;
}
+ }
+
+ .el-button--small:last-child {
+ border: none;
+ background-color: #284FE3 !important;
+
+ &:hover {
+ border: none;
+ background-color: #284FE3 !important;
+ }
+ }
+ }
+
+ .el-time-panel__content {
+ .el-time-spinner__item {
+ &.is-active {
+ color: #fff;
+ }
+
+ &:hover {
+ background: transparent !important;
+ }
+ }
+ }
+
+ .el-time-panel__footer {
+ .el-time-panel__btn {
+ color: #fff;
+ }
+
+ .el-time-panel__btn:first-child {
+ color: #86909C;
}
}
}
@@ -385,6 +498,7 @@
}
.command-select-popper.el-select__popper {
+ min-height: 186px;
border: none;
background: #2E2E48 !important;
@@ -430,49 +544,20 @@
}
}
-.command-cascader {
- height: 40px;
-
- .el-input {
- height: 40px;
- }
-
- .el-input__wrapper {
- --el-input-text-color: #161B2C !important;
- }
-}
-
-.command-cascader-popper.el-cascader__dropdown {
- border: none;
- background: #2E2E48 !important;
-
- .el-cascader-panel {
-
- .el-cascader-menu {
- color: #fff;
-
- .el-cascader-node:hover,
- .el-cascader-node:focus {
- background: transparent !important;
- }
-
- .el-cascader-node.is-selectable.in-active-path {
- color: #fff;
- }
- }
-
- }
-
- .el-popper__arrow::before {
- background: #2E2E48 !important;
- border: 1px solid #2E2E48 !important;
- }
-}
-
// 树形选择
.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;
@@ -493,6 +578,11 @@
.el-tree-node.is-current>.el-tree-node__content {
color: #479dff !important;
+ }
+
+ .el-tree-node__content {
+ height: 34px;
+ line-height: 34px;
}
}
@@ -568,7 +658,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 +680,8 @@
}
.el-form.command-dialog-history-search {
+ margin-bottom: 20px;
+
.el-form-item {
margin-left: 20px;
}
@@ -652,21 +744,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 +758,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 +902,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 +940,6 @@
}
.command-table-container {
- margin-top: 20px;
-
height: 0;
flex: 1;
display: flex;
@@ -852,40 +950,6 @@
flex: 1;
display: flex;
flex-direction: column;
-
- .el-checkbox {
- width: 16px;
- height: 16px;
-
- .el-checkbox__input {
- width: 16px;
- height: 16px;
-
- .el-checkbox__inner {
- width: 16px;
- height: 16px;
-
- background: transparent !important;
- border-radius: 2px 2px 2px 2px;
- border: 2px solid #A1A3D4;
- box-shadow: none;
- box-sizing: border-box;
- }
- }
-
- &.is-checked {
- .el-checkbox__input {
- .el-checkbox__inner {
- border: none;
- background: url("@/assets/images/common/checkbox.png") no-repeat center / 100% 100% !important;
-
- &::after {
- content: none;
- }
- }
- }
- }
- }
}
.command-table-content-bg {
@@ -910,17 +974,17 @@
}
th.el-table__cell {
- height: 40px;
border-bottom: 1px solid #323241 !important;
.cell {
+ display: flex;
+ align-items: center;
padding: 0;
padding-left: 16px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 14px;
color: #FFFFFF;
- line-height: 22px;
font-style: normal;
text-transform: none;
}
@@ -938,7 +1002,6 @@
font-weight: 400;
font-size: 14px;
color: #D2D2E7;
- line-height: 18px;
font-style: normal;
text-transform: none;
}
@@ -965,6 +1028,44 @@
th.el-table__cell:not(.fixed-column),
td.el-table__cell:not(.fixed-column) {
background: transparent !important;
+ }
+
+ .el-table__empty-text {
+ color: #fff;
+ }
+
+ .el-checkbox {
+ width: 16px;
+ height: 16px;
+
+ .el-checkbox__input {
+ width: 16px;
+ height: 16px;
+
+ .el-checkbox__inner {
+ width: 16px;
+ height: 16px;
+
+ background: transparent !important;
+ border-radius: 2px 2px 2px 2px;
+ border: 2px solid #A1A3D4;
+ box-shadow: none;
+ box-sizing: border-box;
+ }
+ }
+
+ &.is-checked {
+ .el-checkbox__input {
+ .el-checkbox__inner {
+ border: none;
+ background: url("@/assets/images/common/checkbox.png") no-repeat center / 100% 100% !important;
+
+ &::after {
+ content: none;
+ }
+ }
+ }
+ }
}
.fixed-column {
@@ -1042,24 +1143,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 +1212,6 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1109,7 +1223,6 @@
font-weight: 400;
font-size: 14px;
color: #9E9EBA;
- line-height: 22px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -1122,12 +1235,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 +1279,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 +1288,7 @@
.el-form-item__content {
display: flex;
align-items: center;
+ line-height: 40px;
.el-input,
.el-input-number {
@@ -1186,6 +1327,7 @@
}
.el-button {
+ height: 40px;
color: #fff;
background: #2E2E48 !important;
border: none;
@@ -1246,6 +1388,7 @@
}
.el-dialog__footer {
+ padding-top: 0;
display: flex;
justify-content: center;
@@ -1272,7 +1415,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 +1454,9 @@
}
.command-page-map-view-dialog {
- padding: 30px;
+ margin: 0;
+
+ padding: 20px;
display: flex;
flex-direction: column;
width: 80%;
@@ -1319,6 +1464,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 +1511,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,14 +1523,20 @@
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;
@@ -1402,7 +1561,6 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1425,6 +1583,7 @@
.command-table-container {
+ height: auto;
margin-top: 0;
margin-bottom: 20px;
@@ -1441,6 +1600,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 +1619,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 +1628,7 @@
.el-form-item__content {
display: flex;
align-items: center;
+ line-height: 40px;
.el-input,
.el-input-number {
@@ -1548,8 +1716,6 @@
}
.search-table-container {
- height: 0;
- flex: 1;
display: flex;
flex-direction: column;
@@ -1590,21 +1756,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