From c8346b01335982aaff53e008f6687f356317f562 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 26 十二月 2024 17:58:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/Process/viewer/index.vue | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/components/Process/viewer/index.vue b/src/components/Process/viewer/index.vue
index 6ecb67a..d57153e 100644
--- a/src/components/Process/viewer/index.vue
+++ b/src/components/Process/viewer/index.vue
@@ -7,6 +7,7 @@
<div class="finish">宸插姙鐞�</div>
<div class="processing">澶勭悊涓�</div>
<div class="todo">鏈繘琛�</div>
+ <div class="overtime">宸茶秴鏃�</div>
</div>
<!-- 娴佺▼鍥炬樉绀� -->
<div v-loading="loading" class="canvas" ref="flowCanvas"></div>
@@ -109,6 +110,9 @@
if (n.$type === 'bpmn:UserTask') {
if (completeTask) {
canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
+ if(completeTask.overtime){
+ canvas.addMarker(n.id, 'highlight-overtime')
+ }
n.outgoing?.forEach(nn => {
const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
if (targetTask) {
@@ -119,6 +123,7 @@
canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
}
+
}
})
}
--
Gitblit v1.8.0