Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-29 4dc1abb37aec033fdbd09d290c6f62d082ba774a

 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 => ({
@@ -108,8 +115,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 +149,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 +193,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 +324,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 +372,7 @@
    },
    z: 1
  }));


  console.log("segments", RunTimes.length, segments);
  const optionOne = {
    title: {
      text: title,
@@ -354,7 +390,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 +473,7 @@
    ]
  };

  mychart.setOption(optionOne);
  mychart.setOption(optionOne, true);
};

</script>