Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-29 4dc1abb37aec033fdbd09d290c6f62d082ba774a

 UI-Project/src/views/largescreendisplay/timeaxis.vue

@@ -115,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;
};