From 897d9dce07aa716151b53b3204a81df63c8031e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 02 三月 2025 10:54:45 +0800
Subject: [PATCH] 流程图用红码判断超时,且显示黄色

---
 src/components/Process/style/flow-viewer.scss |   18 +++++++++---------
 src/components/Process/viewer/index.vue       |    7 ++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/Process/style/flow-viewer.scss b/src/components/Process/style/flow-viewer.scss
index 6628d1e..76fb85c 100644
--- a/src/components/Process/style/flow-viewer.scss
+++ b/src/components/Process/style/flow-viewer.scss
@@ -216,7 +216,7 @@
       margin-right: 8px;
     }
 
-    .willOvertime {
+    .overtime {
       background-color: #fcf5ea;
       padding: 4px;
       border: 1px solid #fce9c7;
@@ -243,13 +243,13 @@
       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;
-    }
+    //.overtime {
+    //  padding: 4px;
+    //  background: #ffd1d1;
+    //  border: 1px solid rgba(246, 181, 181, 0.1);
+    //  border-radius: 3px;
+    //  color: #ff5353;
+    //  margin-right: 5px;
+    //}
   }
 }
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