From 16f122cfcec09e65e4790ecee46bae1f1b7b8fff Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:17:38 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/components/Process/viewer/index.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/components/Process/viewer/index.vue b/src/components/Process/viewer/index.vue
index d57153e..d9daa7a 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="willOvertime">鍗冲皢瓒呮椂</div>
<div class="overtime">宸茶秴鏃�</div>
</div>
<!-- 娴佺▼鍥炬樉绀� -->
@@ -110,8 +111,10 @@
if (n.$type === 'bpmn:UserTask') {
if (completeTask) {
canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
- if(completeTask.overtime){
+ if(completeTask.overtime && completeTask.overtime==='red'){
canvas.addMarker(n.id, 'highlight-overtime')
+ }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)
--
Gitblit v1.8.0