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/viewer/index.vue | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/src/components/Process/viewer/index.vue b/src/components/Process/viewer/index.vue
index ed21bd3..5558f6b 100644
--- a/src/components/Process/viewer/index.vue
+++ b/src/components/Process/viewer/index.vue
@@ -6,9 +6,9 @@
<span class="intro">鐘舵�侊細</span>
<div class="finish">宸插姙鐞�</div>
<div class="processing">澶勭悊涓�</div>
- <div class="todo">鏈繘琛�</div>
<div class="overtime">宸茶秴鏃�</div>
-<!-- <div class="overtime">宸茶秴鏃�</div>-->
+ <div class="jump">璺� 杩�</div>
+ <div class="wait">瀹� 缂�</div>
</div>
<!-- 娴佺▼鍥炬樉绀� -->
<div v-loading="loading" class="canvas" ref="flowCanvas"></div>
@@ -110,25 +110,34 @@
const endTask = nodeData[nodeData.length - 1]
if (n.$type === 'bpmn:UserTask') {
if (completeTask) {
- canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
- if(completeTask.overtime && completeTask.overtime==='red'){
- canvas.addMarker(n.id, 'highlight-willOvertime')
- }
- // else if(completeTask.overtime && completeTask.overtime==='yellow'){
- // canvas.addMarker(n.id, 'highlight-willOvertime')
- // }
- n.outgoing?.forEach(nn => {
- const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
- if (targetTask) {
- if (todoTask && completeTask.key === todoTask.key && !todoTask.completed) {
- canvas.addMarker(nn.id, todoTask.completed ? 'highlight' : 'highlight-todo')
- canvas.addMarker(nn.targetRef.id, todoTask.completed ? 'highlight' : 'highlight-todo')
- } else {
- canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
- canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
- }
-
+ if (completeTask.hasJump) {
+ canvas.addMarker(n.id, 'highlight-jump')
+ } else if (completeTask.hasWait) {
+ canvas.addMarker(n.id, 'highlight-wait')
+ } else {
+ canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
+ if(completeTask.overtime && completeTask.overtime==='red' || completeTask.overtime==='yellow'){
+ canvas.addMarker(n.id, 'highlight-willOvertime')
}
+ }
+ n.outgoing?.forEach(nn => {
+ if (completeTask.hasJump) {
+ canvas.addMarker(nn.id, 'highlight-jump')
+ } else if (completeTask.hasWait) {
+ canvas.addMarker(nn.id, 'highlight-wait')
+ } else {
+ const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
+ if (targetTask) {
+ if (todoTask && completeTask.key === todoTask.key && !todoTask.completed) {
+ canvas.addMarker(nn.id, todoTask.completed ? 'highlight' : 'highlight-todo')
+ canvas.addMarker(nn.targetRef.id, todoTask.completed ? 'highlight' : 'highlight-todo')
+ } else {
+ canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+ canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+ }
+ }
+ }
+
})
}
}
@@ -139,9 +148,14 @@
n.outgoing?.forEach(nn => {
const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
if (targetTask) {
-
- canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
- canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+ if (targetTask.hasJump) {
+ canvas.addMarker(nn.id, 'highlight-jump')
+ } else if (targetTask.hasWait) {
+ canvas.addMarker(nn.id, 'highlight-wait')
+ } else {
+ canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+ canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+ }
}
})
}
@@ -153,8 +167,14 @@
n.outgoing?.forEach(nn => {
const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
if (targetTask) {
- canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
- canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+ if (targetTask.hasJump) {
+ canvas.addMarker(nn.id, 'highlight-jump')
+ } else if (targetTask.hasWait) {
+ canvas.addMarker(nn.id, 'highlight-wait')
+ } else {
+ canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+ canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+ }
}
})
}
@@ -162,8 +182,14 @@
n.outgoing.forEach(nn => {
const completeTask = nodeData.find(m => m.key === nn.targetRef.id)
if (completeTask) {
- canvas.addMarker(nn.id, 'highlight')
- canvas.addMarker(n.id, 'highlight')
+ if (completeTask.hasJump) {
+ canvas.addMarker(nn.id, 'highlight-jump')
+ } else if (completeTask.hasWait) {
+ canvas.addMarker(nn.id, 'highlight-wait')
+ } else {
+ canvas.addMarker(nn.id, 'highlight')
+ canvas.addMarker(n.id, 'highlight')
+ }
return;
}
})
--
Gitblit v1.8.0