From 0bdbb3fce49bb4e8266a9e5cb4cf6a903e88223d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 08 Apr 2026 19:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/styles/common/cockpit.scss | 100 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 875068c..80a3512 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -10,7 +10,8 @@
$search-item-symbol-bg: #fff;
$search-item-symbol-txt: #4E5969;
-.gd-input {
+.gd-input,
+.gd-input-text {
--bg: #{$form-bg};
--tips: #{$form-tips};
@@ -54,6 +55,11 @@
color: #ffffff;
}
+.gd-select,.gd-input,.gd-input-text,.gd-date-picker{
+ .is-disabled{
+ opacity: 0.6;
+ }
+}
.gd-select {
--bg: #{$form-bg};
--tips: #{$form-tips};
@@ -522,7 +528,7 @@
.label {
display: inline-block;
- width: 88px;
+ min-width: 88px;
flex-shrink: 0;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
@@ -554,13 +560,6 @@
white-space: nowrap;
cursor: pointer;
}
- }
- }
-
- .el-upload {
- button {
- background: #4C34FF;
- border: none;
}
}
}
@@ -727,7 +726,7 @@
}
.gd-pagination-parent {
- padding-top: 30px;
+ margin: 16px 0;
display: flex;
justify-content: flex-end;
@@ -816,7 +815,13 @@
color: #4E5969;
}
+ .el-message-box__container {
+ display: flex;
+ justify-content: center;
+ }
+
.el-message-box__btns {
+ padding-top: 10px;
display: flex;
justify-content: center;
@@ -845,7 +850,7 @@
}
.gd-search-form {
- padding-bottom: 20px;
+ padding-bottom: 15px;
display: flex;
.el-form-item__label {
@@ -924,7 +929,7 @@
}
.gd-table-container {
- padding: 12px 20px 30px 20px;
+ padding: 25px 20px 1px;
height: 0;
flex: 1;
display: flex;
@@ -945,12 +950,24 @@
padding-bottom: 20px;
.el-button {
- min-width: 88px;
+ padding: 4px 16px;
+ color: #383874;
border: none;
+ height: 32px;
+ }
+
+ .el-button:first-child {
+ color: #FFFFFF;
}
.el-button.is-disabled,
.el-button.is-disabled:hover {
+ background: #ECECF4;
+ border: none;
+ }
+
+ .el-button:first-child.is-disabled,
+ .el-button:first-child.is-disabled:hover {
background: #4C34FF;
border: none;
}
@@ -1031,18 +1048,6 @@
.el-timeline-item__timestamp {
margin-top: 20px;
}
- }
- }
-}
-
-.gd-tabs {
- .el-tabs__header {
- .el-tabs__item.is-active {
- color: #3247E5;
- }
-
- .el-tabs__active-bar {
- background: #3247E5;
}
}
}
@@ -1178,16 +1183,39 @@
.el-popper {
.el-menu--popup-container {
+ .el-menu--popup {
+ min-width: auto !important;
+ }
+
.el-menu {
+ .el-menu-item {
+ margin: 0 12px !important;
+ margin-top: 14px !important;
+ padding: 0 12px !important;
+ display: flex;
+ justify-content: center;
+ height: 36px;
+ background: transparent !important;
+
+ .el-icon-menu {
+ display: none;
+ }
+
+ &:first-child {
+ margin-top: 0 !important;
+ }
+ }
+
.el-menu-item.is-active {
&::before {
display: none;
}
- background: #4C34FF;
+ background: #F6F6FC !important;
+ border-radius: 8px 8px 8px 8px;
span {
- color: #fff;
+ color: #384CFF;
}
}
}
@@ -1211,6 +1239,21 @@
// .el-form-item:nth-last-child(1) {
// margin-bottom: 0;
// }
+ .gd-select {
+ .el-select__wrapper {
+ height: 36px;
+ }
+ }
+
+ .gd-date-picker {
+ height: 36px;
+ }
+ .gd-input {
+ height: 36px;
+ }
+ .gd-upload-btn {
+ height: 36px;
+ }
.el-input,
.el-input-number {
min-width: 200px;
@@ -1222,10 +1265,11 @@
.el-input__inner {
text-align: left;
+ color: #383874;
&::placeholder {
text-align: left;
}
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3