From a3aa63a1ff805eb3e23218c8323b05c3ab38862e Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 15:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/styles/common/cockpit.scss | 195 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 159 insertions(+), 36 deletions(-)
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index c0ba466..7adbaac 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -4,6 +4,12 @@
$form-bg-gray: #DDE2ED;
$form-tips-gray: #A1A3D4;
+$search-item-icon-color: #383874;
+$search-item-symbol-color: #383874;
+
+$search-item-symbol-bg: #fff;
+$search-item-symbol-txt: #4E5969;
+
.gd-input {
--bg: #{$form-bg};
--tips: #{$form-tips};
@@ -13,12 +19,15 @@
--tips: #{$form-tips-gray};
}
- .el-input__wrapper, .el-textarea__inner {
+ .el-input__wrapper,
+ .el-textarea__inner {
box-shadow: none !important;
background: var(--bg);
border: none;
}
- .el-input__inner, .el-textarea__inner {
+
+ .el-input__inner,
+ .el-textarea__inner {
&::placeholder {
color: var(--tips);
}
@@ -43,7 +52,7 @@
color: #ffffff;
}
-.gd-select, {
+.gd-select {
--bg: #{$form-bg};
--tips: #{$form-tips};
@@ -57,6 +66,13 @@
background: var(--bg);
box-shadow: none !important;
border: none;
+
+
+ .el-select__suffix {
+ .el-icon {
+ color: $search-item-icon-color;
+ }
+ }
}
.el-select__placeholder {
@@ -77,6 +93,14 @@
&.gray {
--bg: #{$form-bg-gray};
--tips: #{$form-tips-gray};
+ }
+
+ .el-icon {
+ color: $search-item-icon-color;
+ }
+
+ .el-range-separator {
+ color: $search-item-symbol-color !important;
}
box-shadow: none !important;
@@ -126,7 +150,7 @@
background: none !important;
}
- .el-tree-node.is-current > .el-tree-node__content {
+ .el-tree-node.is-current>.el-tree-node__content {
color: #479dff !important;
}
}
@@ -184,26 +208,26 @@
}
.gd-date-picker-popper {
- background: #DDE2ED !important;
+ background: #fff !important;
border: none !important;
border-radius: 0px 0px 8px 8px;
.el-date-picker__prev-btn,
.el-date-picker__next-btn {
.el-icon {
- color: #fff !important;
+ color: #4E5969 !important;
}
}
.el-date-picker__header-label {
- color: #fff !important;
+ color: #4E5969 !important;
}
.el-picker-panel {
.el-picker-panel__body-wrapper {
.el-picker-panel__body {
- background: #DDE2ED !important;
- color: #fff !important;
+ background: #fff !important;
+ color: #4E5969 !important;
.el-date-range-picker__time-header {
.el-input__wrapper {
@@ -271,7 +295,7 @@
.el-picker-panel__content {
.el-date-range-picker__header {
.el-picker-panel__icon-btn {
- color: #fff !important;
+ color: #4E5969 !important;
&:hover {
color: var(--el-color-primary) !important;
@@ -284,9 +308,9 @@
}
}
- & > div {
+ &>div {
span {
- color: #fff !important;
+ color: #4E5969 !important;
}
}
}
@@ -311,14 +335,15 @@
td.start-date span,
td.start-date span,
td.end-date span {
- background-color: #DDE2ED !important;
+ color: #fff !important;
+ background-color: #354DFF !important;
}
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: rgba(71, 126, 255, .1) !important;
}
}
}
@@ -392,12 +417,14 @@
.el-overlay-dialog {
display: flex;
- justify-content: center; /* 水平居中 */
- align-items: center; /* 垂直居中 */
+ justify-content: center;
+ /* 水平居中 */
+ align-items: center;
+ /* 垂直居中 */
}
.gd-dialog {
- padding: 30px;
+ padding: 20px;
display: flex;
flex-direction: column;
background: #FFFFFF;
@@ -406,6 +433,9 @@
max-height: 90vh;
.el-dialog__header {
+ padding-bottom: 20px;
+ position: relative;
+
span {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
@@ -415,6 +445,13 @@
text-align: left;
font-style: normal;
text-transform: none;
+ }
+
+ &>button {
+ width: auto;
+ height: auto;
+ display: flex;
+ align-items: center;
}
.el-icon {
@@ -472,6 +509,13 @@
}
}
}
+
+ .el-upload {
+ button {
+ background: #4C34FF;
+ border: none;
+ }
+ }
}
.el-dialog__footer {
@@ -495,15 +539,14 @@
flex: 1;
background: transparent !important;
- .el-table--border .el-table__inner-wrapper:after,
- .el-table--border:after,
- .el-table--border:before,
- .el-table__inner-wrapper:before {
- height: 0;
- }
-
tr {
background: transparent !important;
+ }
+
+ tr.el-table__row {
+ &:hover {
+ background: #F7F8FC !important;
+ }
}
th.el-table__cell {
@@ -541,16 +584,38 @@
td.operation-btns .cell {
display: flex;
flex-wrap: nowrap;
- gap: 12px;
/* 按钮间距（推荐） */
white-space: nowrap;
/* 双保险 */
a {
+ display: flex;
+ align-items: center;
+ position: relative;
+ margin: 0 10px;
min-width: 28px;
+
+ &:first-child {
+ margin-left: 0;
+ }
+
+ &::before {
+ content: '';
+ position: absolute;
+ top: 50%;
+ right: -10px;
+ width: 1px;
+ height: 12px;
+ background: #BCC8E3;
+ transform: translateY(calc(-50% - 1px));
+ }
&:last-child {
margin-right: 0;
+
+ &::before {
+ display: none;
+ }
}
}
}
@@ -560,8 +625,53 @@
background: transparent !important;
}
+ .el-checkbox {
+ width: 16px;
+ height: 16px;
+
+ .el-checkbox__input {
+ width: 16px;
+ height: 16px;
+
+ .el-checkbox__inner {
+ width: 16px;
+ height: 16px;
+
+ border: none;
+ background: url("@/assets/images/common/n-checkbox.png") no-repeat center / 100% 100% !important;
+ }
+ }
+
+ &.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;
+ }
+}
+
+.el-table {
+
+ .el-table--border .el-table__inner-wrapper:after,
+ .el-table--border:after,
+ .el-table--border:before,
+ .el-table__inner-wrapper:before {
+ height: 0;
+ }
+
+ td.el-table__cell {
+ border: none !important;
}
}
@@ -634,16 +744,16 @@
}
.gd-confirm-custom {
- background: #1A1A2A;
+ background: #fff;
border-radius: 6px;
- border: 1px solid #2E2E46;
+ border: none;
.el-message-box__header {
.el-message-box__title {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
font-size: 18px;
- color: #FFFFFF;
+ color: #383874;
line-height: 22px;
text-align: left;
font-style: normal;
@@ -652,7 +762,7 @@
}
.el-message-box__content {
- color: #D4D5D7;
+ color: #4E5969;
}
.el-message-box__btns {
@@ -672,14 +782,15 @@
}
.gd-confirm-button {
- background: #284FE3 !important;
- border-color: #284FE3 !important;
+ background: #4C34FF !important;
+ border: none !important;
+ color: #fff !important;
}
.gd-confirm-cancel-button {
- background: #2B2B4C !important;
- border-color: #2B2B4C !important;
- color: #FFFFFF !important;
+ background: #F2F3F5 !important;
+ border: none !important;
+ color: #161B2C !important;
}
.gd-search-form {
@@ -796,14 +907,14 @@
.gd-select-popper {
border: none;
- background: $form-bg !important;
+ background: $search-item-symbol-bg !important;
.el-select-dropdown {
.el-scrollbar {
.el-select-dropdown__wrap {
.el-select-dropdown__list {
.el-select-dropdown__item {
- color: #4E5969;
+ color: $search-item-symbol-txt;
&.hover {
background-color: rgba(0, 120, 233, 0.63) !important;
@@ -872,3 +983,15 @@
}
}
}
+
+.gd-tabs {
+ .el-tabs__header {
+ .el-tabs__item.is-active {
+ color: #3247E5;
+ }
+
+ .el-tabs__active-bar {
+ background: #3247E5;
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3