From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 11:31:04 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/components/Process/style/flow-viewer.scss | 138 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 105 insertions(+), 33 deletions(-)
diff --git a/src/components/Process/style/flow-viewer.scss b/src/components/Process/style/flow-viewer.scss
index 051c33e..15c6b67 100644
--- a/src/components/Process/style/flow-viewer.scss
+++ b/src/components/Process/style/flow-viewer.scss
@@ -7,7 +7,9 @@
.flowMsgPopover {
display: none;
}
-
+.bjs-powered-by {
+ display: none;
+}
.tipBox {
width: 180px;
background: #fff;
@@ -97,7 +99,7 @@
right: 10px;
}
- // 娴佺▼绾�
+ /* ---------瀹屾垚棰滆壊---------- */
.highlight.djs-shape .djs-visual > :nth-child(1) {
fill: #56bb56 !important;
stroke: #56bb56 !important;
@@ -118,38 +120,90 @@
stroke: #56bb56 !important;
}
- .highlight-todo.djs-connection > .djs-visual > path {
- stroke: #eab24a !important;
- stroke-dasharray: 4px !important;
- fill-opacity: 0.2 !important;
- }
-
+ /* ----------浠ｅ姙棰滆壊---------- */
.highlight-todo.djs-shape .djs-visual > :nth-child(1) {
- stroke-dasharray: 5, 5;
- stroke-dashoffset: 500;
+ fill: #559db0 !important;
+ stroke: #559db0 !important;
+ fill-opacity: 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-wait.djs-shape .djs-visual > :nth-child(1) {
+ fill: #F56C6C !important;
+ stroke: #F56C6C !important;
+ fill-opacity: 0.2 !important;
+ }
+ //鏂囧瓧棰滆壊
+ .highlight-wait.djs-shape .djs-visual > :nth-child(2) {
+ fill: #F56C6C !important;
+ }
+ //浜虹墿ui棰滆壊
+ .highlight-wait.djs-shape .djs-visual > path {
+ fill: #F56C6C !important;
+ fill-opacity: 0.2 !important;
+ stroke: #F56C6C !important;
+ }
+ //鍓嶉潰閭ｆ潯绾跨殑棰滆壊
+ .highlight-wait.djs-connection > .djs-visual > path {
+ stroke: #F56C6C !important;
+}
+
+ /* --------璺宠繃棰滆壊--------- */
+ .highlight-jump.djs-shape .djs-visual > :nth-child(1) {
+ fill: #909399 !important;
+ stroke: #909399 !important;
+ fill-opacity: 0.2 !important;
+ }
+ //鏂囧瓧棰滆壊
+ .highlight-jump.djs-shape .djs-visual > :nth-child(2) {
+ fill: #909399 !important;
+ }
+ //浜虹墿ui棰滆壊
+ .highlight-jump.djs-shape .djs-visual > path {
+ fill: #909399 !important;
+ fill-opacity: 0.2 !important;
+ stroke: #909399 !important;
+ }
+ //鍓嶉潰閭ｆ潯绾跨殑棰滆壊
+ .highlight-jump.djs-connection > .djs-visual > path {
+ stroke: #909399 !important;
+ }
+
+
+ /* --------瓒呮椂棰滆壊 */
+ .highlight-willOvertime.djs-shape .djs-visual > :nth-child(1) {
+ fill: #eab24a !important;
stroke: #eab24a !important;
- fill: rgba(252, 211, 127, 0.2) !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;
+ .highlight-willOvertime.djs-shape .djs-visual > :nth-child(2) {
+ fill: #eab24a !important;
}
- .highlight-overtime.djs-shape .djs-visual > path {
- fill: #ff5353 !important;
+ .highlight-willOvertime.djs-shape .djs-visual > path {
+ fill: #eab24a !important;
fill-opacity: 0.2 !important;
- stroke: #ff5353 !important;
+ stroke: #eab24a !important;
}
- .highlight-overtime.djs-connection > .djs-visual > path {
- stroke: #ff5353 !important;
+ .highlight-willOvertime.djs-connection > .djs-visual > path {
+ stroke: #eab24a !important;
}
@@ -184,31 +238,49 @@
margin-right: 8px;
}
- .processing {
+ .overtime {
background-color: #fcf5ea;
padding: 4px;
border: 1px solid #fce9c7;
border-radius: 3px;
- color: #eab24a;
+ color: #de9603;
margin-right: 8px;
}
- .todo {
+ .processing {
+ background-color: #d8f1fc;
padding: 4px;
- background: #ECEDEE;
+ border: 1px solid #b6e1f5;
+ border-radius: 3px;
+ color: #559db0;
+ margin-right: 8px;
+ }
+
+ .jump {
+ padding: 4px;
+ background: #909399;
border: 1px solid rgba(204, 204, 204, 0.1);
border-radius: 3px;
- color: #666666;
+ color: #4f4f4f;
margin-right: 5px;
}
- .overtime {
+ .wait {
padding: 4px;
- background: #ffd1d1;
- border: 1px solid rgba(255, 0, 0, 0.1);
+ background: #F56C6C;
+ border: 1px solid rgba(204, 204, 204, 0.1);
border-radius: 3px;
- color: #ff5353;
+ color: #eae9e9;
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