From c8806084643755f72aa93354e64cefcf049fe161 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Tue, 16 Jun 2026 10:49:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E7=BA=A2=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E4=B8=BA2=E3=80=813=E5=A4=A9=E7=9A=84=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/negative/action-history.vue | 27 ++++++----------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/components/negative/action-history.vue b/src/components/negative/action-history.vue
index 0539a7a..4360c01 100644
--- a/src/components/negative/action-history.vue
+++ b/src/components/negative/action-history.vue
@@ -63,34 +63,21 @@ function getConsumingTime(crtTime, index) {
     }
     return moment(crtTime).diff(moment(actionHistory.value[index - 1].crtTime), "seconds")
 }
-const catchStore = useCatchStore();
-// 触发字典加载
-catchStore.getDicts(["approveShouldHighlight"]);
-// 在 computed 中通过 store 直接访问
-const highlightKeywords = computed(() => catchStore.dict.approveShouldHighlight || []);
-const shouldHighlight = (item) => {
-  const keywords = highlightKeywords.value;
-  const matchKeyword = keywords.some(k => item.actionName?.includes(k.dictLabel));
-  if (!matchKeyword) return false;
 
-  return item.duration > 86400;
+// 直接使用后端计算的 timeoutFlag 判断是否高亮
+const shouldHighlight = (item) => {
+  return item.timeoutFlag === true;
 }
-const getOvertimeTip = (item) => {
-  const keywords = highlightKeywords.value;
-  const matchKeyword = keywords.some(k => item.actionName?.includes(k.dictLabel));
-  if (!matchKeyword || !item.duration) {
-    return '';
-  }
 
-  if (item.duration <= 86400) {
+// 使用后端计算的 overtimeStatus 和 overtimeDuration 构建提示
+const getOvertimeTip = (item) => {
+  if (!item.timeoutFlag || !item.duration) {
     return '';
   }
-
-  const overtimeSeconds = item.duration - 86400;
+  const overtimeSeconds = item.overtimeDuration || 0;
   const days = Math.floor(overtimeSeconds / 86400);
   const hours = Math.floor((overtimeSeconds % 86400) / 3600);
   const minutes = Math.floor((overtimeSeconds % 3600) / 60);
-
   return `超时 ${days}天${hours}时${minutes}分`;
 }
 const activeHistory = ref({})