From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/styles/common/cockpit.scss | 108 +++++++++++++++++++-----------------------------------
1 files changed, 38 insertions(+), 70 deletions(-)
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 9a0d6aa..6ad24b1 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -1,6 +1,6 @@
//变量
$gd-placeholder: #86909C;
-$form-bg:#F2F3F5;
+$form-bg: #F2F3F5;
.gd-table {
height: 0;
@@ -79,14 +79,14 @@
}
.gd-input {
- .el-input__wrapper,.el-textarea__inner {
+ .el-input__wrapper, .el-textarea__inner {
padding: 0 8px !important;
background: $form-bg;
box-shadow: none !important;
border: none;
}
- .el-input__inner,.el-textarea__inner {
+ .el-input__inner, .el-textarea__inner {
&::placeholder {
color: $gd-placeholder;
}
@@ -458,11 +458,11 @@
padding: 30px;
display: flex;
flex-direction: column;
- width: 770px;
-
background: #FFFFFF;
border: 1px solid #CCCCCC;
border-radius: 6px 6px 6px 6px;
+ margin-top: 10vh !important;
+
.el-dialog__header {
span {
@@ -482,86 +482,52 @@
}
.el-dialog__body {
- height: 0;
- flex: 1;
+ max-height: 70vh;
+ min-height: 20vh;
+ overflow: auto;
- .detail-container {
- padding: 0 10px;
-
- .detail-title {
- margin-bottom: 30px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 18px;
- color: #FFFFFF;
- text-align: left;
- font-style: normal;
- text-transform: none;
- }
-
- .el-row {
- .el-col {
- margin-bottom: 20px;
- display: flex;
- align-items: center;
-
- .label {
- width: 88px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 14px;
- color: #86909C;
- line-height: 22px;
- text-align: right;
- font-style: normal;
- text-transform: none;
- }
-
- .val {
- margin-left: 12px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 14px;
- color: #4E5969;
- line-height: 22px;
- text-align: left;
- font-style: normal;
- text-transform: none;
- }
- }
- }
-
-
- .gd-table-container {
- height: 360px;
-
- .gd-pagination-parent {
- justify-content: center;
- }
- }
+ .detail-title {
+ margin-bottom: 20px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #161B2C;
}
- .dialog-form {
- .el-form-item {
+ // 查看
+ .detail-row-view {
+ background: #F2F3F5;
+ border-radius: 2px 2px 2px 2px;
+ gap: 20px 0;
+ padding: 20px;
+
+ .el-col {
display: flex;
align-items: center;
+ margin-bottom: 0;
- .el-form-item__label {
- display: flex;
- align-items: center;
+ .label {
+ width: 88px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 14px;
- color: #4E5969;
+ color: #86909C;
line-height: 22px;
text-align: right;
font-style: normal;
text-transform: none;
}
- .el-form-item__content {
- display: flex;
- align-items: center;
+ .val {
+ margin-left: 12px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #4E5969;
+ line-height: 22px;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
}
}
}
@@ -895,3 +861,5 @@
}
}
+
+
--
Gitblit v1.9.3