From 71b13e3b8b57b2f9577582d9de62168fd8dc6766 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 14:03:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/styles/common/cockpit.scss | 230 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 143 insertions(+), 87 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index 9b8ef08..2844d2d 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 {
@@ -139,7 +182,7 @@
}
.command-date-picker-popper {
- background: #161B2C !important;
+ background: #2E2E48 !important;
border: none !important;
border-radius: 0px 0px 8px 8px;
@@ -157,7 +200,7 @@
.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 {
@@ -220,6 +263,12 @@
}
}
}
+
+ .el-input__wrapper {
+ height: 28px;
+ background: #1A1A2A;
+ box-shadow: none;
+ }
}
}
@@ -269,11 +318,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: #284FE3 !important;
}
}
}
@@ -283,8 +338,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;
}
}
@@ -326,21 +381,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;
}
}
}
@@ -435,45 +522,6 @@
}
}
-.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;
@@ -508,6 +556,11 @@
.el-tree-node.is-current>.el-tree-node__content {
color: #479dff !important;
+ }
+
+ .el-tree-node__content {
+ height: 34px;
+ line-height: 34px;
}
}
@@ -875,40 +928,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 {
@@ -933,17 +952,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: 40px;
font-style: normal;
text-transform: none;
}
@@ -961,7 +980,6 @@
font-weight: 400;
font-size: 14px;
color: #D2D2E7;
- line-height: 18px;
font-style: normal;
text-transform: none;
}
@@ -990,6 +1008,44 @@
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 {
background-color: #1A1A2A !important;
}
--
Gitblit v1.9.3