From 43d86830f4696c3ba2250a961d26377e1ff6cc32 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 10:39:43 +0800
Subject: [PATCH] 1、 查询是否除膜优化

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

diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index cd77638..9b83411 100644
--- a/UI-Project/src/views/largescreendisplay/timeaxis.vue
+++ b/UI-Project/src/views/largescreendisplay/timeaxis.vue
@@ -35,7 +35,6 @@
 import { useI18n } from 'vue-i18n'
 import { useRouter, useRoute } from "vue-router"
 import request from "@/utils/request"
-import { host, WebSocketHost } from '@/utils/constants'
 import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
 import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -61,7 +60,7 @@
   try {
     let startTime = window.localStorage.getItem('startTime')
     let response;
-    if (key == "1" || key == "2") {
+    if (key == "1"||key == "2") {
       response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
     } else if (key == "3") {
       response = await request.get("/cacheVerticalGlass/bigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
@@ -97,24 +96,14 @@
   const tableData = [];
   if (tableDatax.value.length > 0) {
     tableDatax.value.forEach((item, index) => {
-      const time1 = new Date(index == 0 ? item.startTimestamp : tableDatax.value[index - 1].secondTimestamp);
-      const time2 = new Date(index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp);
-
-      const diffInSeconds = Math.abs(time2 - time1) / 1000;
-      if (diffInSeconds > 60) {
-        tableData.push({
-          firstTimestamp: index == 0 ? item.startTimestamp : tableDatax.value[index - 1].secondTimestamp,
-          secondTimestamp: index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp,
-          diffMinutes: item.diffMinutes,
-          startTimestamp: item.startTimestamp,
-          endTimestamp: item.endTimestamp,
-          state: 1
-        });
-        console.log("闂撮殧瓒呰繃60绉�", diffInSeconds, time1, time2);
-      } else {
-        console.log("闂撮殧涓嶈秴杩�60绉�", diffInSeconds, time1, time2);
-      }
-
+      tableData.push({
+        firstTimestamp: index == 0 ? item.startTimestamp : tableDatax.value[index - 1].secondTimestamp,
+        secondTimestamp: index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp,
+        diffMinutes: item.diffMinutes,
+        startTimestamp: item.startTimestamp,
+        endTimestamp: item.endTimestamp,
+        state: 1
+      });
       if (result) {
         tableData.push({
           firstTimestamp: item.firstTimestamp,
@@ -125,8 +114,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;
 };
 
@@ -148,7 +149,7 @@
     let page = window.localStorage.getItem('pagenumber')
     let startTime = window.localStorage.getItem('startTime')
     let response;
-    if (key == "1" || key == "2") {
+    if (key == "1"||key == "2") {
       response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
     } else if (key == "3") {
       response = await request.get("/cacheVerticalGlass/bigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
@@ -192,7 +193,7 @@
     let startTime = window.localStorage.getItem('startTime')
     let page = window.localStorage.getItem('pagenumber')
     let response;
-    if (key == "1" || key == "2") {
+    if (key == "1"||key == "2") {
       response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
     } else if (key == "3") {
       response = await request.get("/cacheVerticalGlass/bigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
@@ -388,7 +389,14 @@
       backgroundColor: 'rgba(50,50,50,0.7)',
       textStyle: { color: '#fff' },
       formatter: (params) => {
+        const seen = new Set();
         const items = params
+        .filter(p => {
+            const key = p.data?.extra?.start + '|' + p.data?.extra?.end;
+            if (seen.has(key)) return false;
+            seen.add(key);
+            return true;
+          })
           .map(p => {
             const start = p.data?.extra?.start;
             const end = p.data?.extra?.end;

--
Gitblit v1.8.0