From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreendisplay/timeaxis.vue | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index cd77638..87fbff6 100644
--- a/UI-Project/src/views/largescreendisplay/timeaxis.vue
+++ b/UI-Project/src/views/largescreendisplay/timeaxis.vue
@@ -61,7 +61,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 +97,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,
@@ -148,7 +138,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 +182,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 +378,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