From fcb8b8cc392b146aa11bbaab9e497f7f13f29d44 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 26 五月 2025 11:38:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/largescreendisplay/timeaxis.vue | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index 5f449c6..cd77638 100644
--- a/UI-Project/src/views/largescreendisplay/timeaxis.vue
+++ b/UI-Project/src/views/largescreendisplay/timeaxis.vue
@@ -60,7 +60,14 @@
const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
- const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ let response;
+ 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])
+ } else {
+ response = await request.get("/hollowGlass/hollowBigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ }
if (response.code == 200) {
ElMessage.success(response.message);
// const formattedData = response.data.records.map(record => ({
@@ -90,14 +97,24 @@
const tableData = [];
if (tableDatax.value.length > 0) {
tableDatax.value.forEach((item, index) => {
- 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
- });
+ 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);
+ }
+
if (result) {
tableData.push({
firstTimestamp: item.firstTimestamp,
@@ -130,7 +147,14 @@
}
let page = window.localStorage.getItem('pagenumber')
let startTime = window.localStorage.getItem('startTime')
- const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ let response;
+ 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])
+ } else {
+ response = await request.get("/hollowGlass/hollowBigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ }
if (response.code == 200) {
ElMessage.success(response.message);
// const formattedData = response.data.records.map(record => ({
@@ -167,7 +191,14 @@
}
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
- const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ let response;
+ 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])
+ } else {
+ response = await request.get("/hollowGlass/hollowBigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ }
if (response.code == 200) {
currentPage2.value = 1
ElMessage.success(response.message);
@@ -291,6 +322,10 @@
let myChart = null;
const chart = ref(null)
const timeAxisCreate = (title, chartDom, mychart, RunTimes) => {
+ if (mychart) {
+ mychart.clear();
+ // 濡傛灉闇�瑕侊紝鍙互閲嶆柊鍒濆鍖栧浘琛�
+ }
if (!chartDom) {
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
return;
@@ -335,8 +370,7 @@
},
z: 1
}));
-
-
+ console.log("segments", RunTimes.length, segments);
const optionOne = {
title: {
text: title,
@@ -430,7 +464,7 @@
]
};
- mychart.setOption(optionOne);
+ mychart.setOption(optionOne, true);
};
</script>
--
Gitblit v1.8.0