From e4439e5d0a2cba9983f013bd044fe4e22c7b7077 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 11 Feb 2026 16:35:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/styles/common/cockpit.scss | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 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..855c465 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -522,7 +522,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 +554,6 @@
white-space: nowrap;
cursor: pointer;
}
- }
- }
-
- .el-upload {
- button {
- background: #4C34FF;
- border: none;
}
}
}
@@ -816,7 +809,13 @@
color: #4E5969;
}
+ .el-message-box__container {
+ display: flex;
+ justify-content: center;
+ }
+
.el-message-box__btns {
+ padding-top: 10px;
display: flex;
justify-content: center;
@@ -1035,18 +1034,6 @@
}
}
-.gd-tabs {
- .el-tabs__header {
- .el-tabs__item.is-active {
- color: #3247E5;
- }
-
- .el-tabs__active-bar {
- background: #3247E5;
- }
- }
-}
-
.gd-dialog-table {
background: transparent !important;
@@ -1211,6 +1198,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 +1224,11 @@
.el-input__inner {
text-align: left;
+ color: #383874;
&::placeholder {
text-align: left;
}
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3