From 78e5ece58bf05ed6f344239f40b49dbe90956cce Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 14 一月 2025 17:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/Process/style/flow-viewer.scss | 92 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 11 deletions(-)
diff --git a/src/components/Process/style/flow-viewer.scss b/src/components/Process/style/flow-viewer.scss
index 2c90d25..91c5d9b 100644
--- a/src/components/Process/style/flow-viewer.scss
+++ b/src/components/Process/style/flow-viewer.scss
@@ -97,7 +97,7 @@
right: 10px;
}
- // 娴佺▼绾�
+ // 瀹屾垚娴佺▼绾�
.highlight.djs-shape .djs-visual > :nth-child(1) {
fill: #56bb56 !important;
stroke: #56bb56 !important;
@@ -118,18 +118,70 @@
stroke: #56bb56 !important;
}
- .highlight-todo.djs-connection > .djs-visual > path {
- stroke: #eab24a !important;
- stroke-dasharray: 4px !important;
+ // 浠ｅ姙娴佺▼绾�
+ .highlight-todo.djs-shape .djs-visual > :nth-child(1) {
+ fill: #559db0 !important;
+ stroke: #559db0 !important;
fill-opacity: 0.2 !important;
}
- .highlight-todo.djs-shape .djs-visual > :nth-child(1) {
- stroke-dasharray: 5, 5;
- stroke-dashoffset: 500;
- stroke: #eab24a !important;
- fill: rgba(252, 211, 127, 0.2) !important;
+ .highlight-todo.djs-shape .djs-visual > :nth-child(2) {
+ fill: #559db0 !important;
}
+
+ .highlight-todo.djs-shape .djs-visual > path {
+ fill: #559db0 !important;
+ fill-opacity: 0.2 !important;
+ stroke: #559db0 !important;
+ }
+
+ .highlight-todo.djs-connection > .djs-visual > path {
+ stroke: #559db0 !important;
+ }
+
+ // 宸茶秴鏃舵祦绋嬬嚎
+ //鏂瑰潡鍐呴儴棰滆壊
+ .highlight-overtime.djs-shape .djs-visual > :nth-child(1) {
+ fill: #ff5353 !important;
+ stroke: #ff5353 !important;
+ fill-opacity: 0.2 !important;
+ }
+ //鏂囧瓧棰滆壊
+ .highlight-overtime.djs-shape .djs-visual > :nth-child(2) {
+ fill: #ff5353 !important;
+ }
+ //浜虹墿ui棰滆壊
+ .highlight-overtime.djs-shape .djs-visual > path {
+ fill: #ff5353 !important;
+ fill-opacity: 0.2 !important;
+ stroke: #ff5353 !important;
+ }
+ //鍓嶉潰閭ｆ潯绾跨殑棰滆壊
+ .highlight-overtime.djs-connection > .djs-visual > path {
+ stroke: #ff5353 !important;
+}
+
+ // 鍗冲皢瓒呮椂娴佺▼绾�
+ .highlight-willOvertime.djs-shape .djs-visual > :nth-child(1) {
+ fill: #eab24a !important;
+ stroke: #eab24a !important;
+ fill-opacity: 0.2 !important;
+ }
+
+ .highlight-willOvertime.djs-shape .djs-visual > :nth-child(2) {
+ fill: #eab24a !important;
+ }
+
+ .highlight-willOvertime.djs-shape .djs-visual > path {
+ fill: #eab24a !important;
+ fill-opacity: 0.2 !important;
+ stroke: #eab24a !important;
+ }
+
+ .highlight-willOvertime.djs-connection > .djs-visual > path {
+ stroke: #eab24a !important;
+ }
+
@keyframes draw {
100% {
@@ -162,12 +214,21 @@
margin-right: 8px;
}
- .processing {
+ .willOvertime {
background-color: #fcf5ea;
padding: 4px;
border: 1px solid #fce9c7;
border-radius: 3px;
- color: #eab24a;
+ color: #de9603;
+ margin-right: 8px;
+ }
+
+ .processing {
+ background-color: #d8f1fc;
+ padding: 4px;
+ border: 1px solid #b6e1f5;
+ border-radius: 3px;
+ color: #559db0;
margin-right: 8px;
}
@@ -179,5 +240,14 @@
color: #666666;
margin-right: 5px;
}
+
+ .overtime {
+ padding: 4px;
+ background: #ffd1d1;
+ border: 1px solid rgba(246, 181, 181, 0.1);
+ border-radius: 3px;
+ color: #ff5353;
+ margin-right: 5px;
+ }
}
}
--
Gitblit v1.8.0