From c78889e71d16d26c03ff59746db47c6d4d2b98e0 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 03 三月 2025 20:41:25 +0800 Subject: [PATCH] Merge branch 'master' into dev --- src/components/Process/viewer/index.vue | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Process/viewer/index.vue b/src/components/Process/viewer/index.vue index d9daa7a..ed21bd3 100644 --- a/src/components/Process/viewer/index.vue +++ b/src/components/Process/viewer/index.vue @@ -7,8 +7,8 @@ <div class="finish">宸插姙鐞�</div> <div class="processing">澶勭悊涓�</div> <div class="todo">鏈繘琛�</div> - <div class="willOvertime">鍗冲皢瓒呮椂</div> <div class="overtime">宸茶秴鏃�</div> +<!-- <div class="overtime">宸茶秴鏃�</div>--> </div> <!-- 娴佺▼鍥炬樉绀� --> <div v-loading="loading" class="canvas" ref="flowCanvas"></div> @@ -112,10 +112,11 @@ if (completeTask) { canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo') 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') } + // 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) { -- Gitblit v1.8.0