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 | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index 5f449c6..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'
@@ -60,7 +59,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 => ({
@@ -108,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;
};
@@ -130,7 +148,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 +192,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 +323,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 +371,7 @@
},
z: 1
}));
-
-
+ console.log("segments", RunTimes.length, segments);
const optionOne = {
title: {
text: title,
@@ -354,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;
@@ -430,7 +472,7 @@
]
};
- mychart.setOption(optionOne);
+ mychart.setOption(optionOne, true);
};
</script>
--
Gitblit v1.8.0