From 4dc1abb37aec033fdbd09d290c6f62d082ba774a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 29 十一月 2025 17:07:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/largescreendisplay/timeaxis.vue |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index 87fbff6..206da1e 100644
--- a/UI-Project/src/views/largescreendisplay/timeaxis.vue
+++ b/UI-Project/src/views/largescreendisplay/timeaxis.vue
@@ -115,8 +115,20 @@
           state: 2
         });
       }
+      if(index == tableDatax.value.length - 1){
+        tableData.push({
+          firstTimestamp: item.secondTimestamp,
+          secondTimestamp: item.endTimestamp,
+          diffMinutes: item.diffMinutes,
+          startTimestamp: item.startTimestamp,
+          endTimestamp: item.endTimestamp,
+          state: 1
+        });
+      }
     });
   }
+  console.log(tableData);
+  
   return tableData;
 };
 

--
Gitblit v1.8.0