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/task-work-order/src/styles/common/cockpit.scss | 250 +++++++++++++++++++++++++------------------------
1 files changed, 127 insertions(+), 123 deletions(-)
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 3567474..bdd93cd 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -1,27 +1,32 @@
-//变量
$form-bg: #F2F3F5;
$form-tips: #86909C;
+//灰色变量
$form-bg-gray: #DDE2ED;
$form-tips-gray: #A1A3D4;
-
.gd-input {
- --el-input-bg-color: #{$form-bg};
- --el-input-placeholder-color: #{$form-tips};
+ --bg: #{$form-bg};
+ --tips: #{$form-tips};
&.gray {
- --el-input-bg-color: #{$form-bg-gray};
- --el-input-placeholder-color: #{$form-tips-gray};
+ --bg: #{$form-bg-gray};
+ --tips: #{$form-tips-gray};
}
.el-input__wrapper, .el-textarea__inner {
box-shadow: none !important;
+ background: var(--bg);
border: none;
+ }
+ .el-input__inner, .el-textarea__inner {
+ &::placeholder {
+ color: var(--tips);
+ }
}
&.is-disabled {
.el-input__wrapper {
- background: $form-bg;
+ background: var(--bg);
}
}
}
@@ -85,83 +90,6 @@
.el-range-separator {
color: #ffffff;
- }
-}
-
-
-.gd-table {
- height: 0;
- 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;
- }
-
- th.el-table__cell {
- height: 40px;
- border-bottom: 1px solid #DBDFF1 !important;
-
- .cell {
- padding: 0 0 0 16px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 14px;
- color: #9292C1;
- text-align: left;
- font-style: normal;
- text-transform: none;
- }
- }
-
- td.el-table__cell {
- padding: 9px 0;
- height: 56px;
-
- .cell {
- padding: 0 0 0 16px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 14px;
- color: #383874;
- text-align: left;
- font-style: normal;
- text-transform: none;
- }
- }
-
- td.operation-btns .cell {
- display: flex;
- flex-wrap: nowrap;
- gap: 12px;
- /* 按钮间距(推荐) */
- white-space: nowrap;
- /* 双保险 */
-
- a {
- min-width: 28px;
- color: #0075FF;
-
- &:last-child {
- margin-right: 0;
- }
- }
- }
-
- th.el-table__cell:not(.fixed-column),
- td.el-table__cell:not(.fixed-column) {
- background: transparent !important;
- }
-
- .fixed-column {
- background-color: #1A1A2A !important;
}
}
@@ -242,7 +170,6 @@
}
}
}
-
.gd-date-picker-popper {
background: #DDE2ED !important;
@@ -556,6 +483,82 @@
}
}
+.gd-table {
+ height: 0;
+ 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;
+ }
+
+ th.el-table__cell {
+ height: 40px;
+ border-bottom: 1px solid #DBDFF1 !important;
+
+ .cell {
+ padding: 0 0 0 16px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #9292C1;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ }
+ }
+
+ td.el-table__cell {
+ padding: 9px 0;
+ height: 56px;
+
+ .cell {
+ padding: 0 0 0 16px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #383874;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ }
+ }
+
+ td.operation-btns .cell {
+ display: flex;
+ flex-wrap: nowrap;
+ gap: 12px;
+ /* 按钮间距(推荐) */
+ white-space: nowrap;
+ /* 双保险 */
+
+ a {
+ min-width: 28px;
+ color: #0075FF;
+
+ &:last-child {
+ margin-right: 0;
+ }
+ }
+ }
+
+ th.el-table__cell:not(.fixed-column),
+ td.el-table__cell:not(.fixed-column) {
+ background: transparent !important;
+ }
+
+ .fixed-column {
+ background-color: #1A1A2A !important;
+ }
+}
+
.gd-pagination-parent {
padding-top: 30px;
display: flex;
@@ -700,44 +703,6 @@
.gd-input {
width: 200px;
height: 36px;
-
- .el-input__wrapper {
- }
-
- &.is-disabled {
- .el-input__wrapper {
- }
- }
- }
-
- .gd-date-picker-popper {
-
- .el-picker-panel {
- .el-picker-panel__body-wrapper {
- .el-picker-panel__body {
-
- .el-date-picker__time-header {
-
- .el-date-picker__editor-wrap {
- .el-time-panel {
-
- // 将 time-picker-popper 的样式移到这里
- .el-time-panel__header {
- }
- }
- }
- }
- }
- }
- }
-
- .el-popper__arrow {
- &::before {
- background: #DDE2ED !important;
- border: 1px solid #DDE2ED !important;
- box-sizing: border-box;
- }
- }
}
.gd-search-actions {
@@ -860,5 +825,44 @@
}
}
+.gd-timeline {
+ padding-left: 120px;
+ .el-timeline-item {
+ height: 120px;
+ &:nth-last-child(1) {
+ height: auto;
+ }
+
+ .el-timeline-item__tail {
+ left: 15px;
+ transform: translate(-15px);
+ border-left-color: #4c34ff;
+ }
+
+ .el-timeline-item__node {
+ width: 32px;
+ height: 32px;
+ background-color: #161b2c;
+ transform: translate(-15px);
+
+ &.el-timeline-item__node--success {
+ background-color: #4c34ff;
+ }
+
+ .el-timeline-item__icon {
+ font-size: 22px;
+ }
+ }
+
+ .el-timeline-item__wrapper {
+ top: 5px;
+ font-size: 16px;
+
+ .el-timeline-item__timestamp {
+ margin-top: 20px;
+ }
+ }
+ }
+}
--
Gitblit v1.9.3