From 5f2cc81d68f3065b7bcaa7dfac48f29e263b0042 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 10 六月 2025 13:44:44 +0800
Subject: [PATCH] 上片模块预览工程确认时，“除膜方式”必填判断
---
UI-Project/src/views/largescreendisplay/timeaxis.vue | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index 5f449c6..87fbff6 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 => ({
@@ -130,7 +137,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 +181,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 +312,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 +360,7 @@
},
z: 1
}));
-
-
+ console.log("segments", RunTimes.length, segments);
const optionOne = {
title: {
text: title,
@@ -354,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;
@@ -430,7 +461,7 @@
]
};
- mychart.setOption(optionOne);
+ mychart.setOption(optionOne, true);
};
</script>
--
Gitblit v1.8.0