Merge branch 'dev/z' into dev/L

src/pages/footer/component/timers.vue

@@ -231,7 +231,7 @@ const wssOpenHandle = (data) => {
     // 如果连接已打开，直接发送数据
     (wssInstance.value).send(JSON.stringify(data));
     wssMessageHandle();
-    console.warn('WebSocket 已连接，无法发送数据:', data);
+    // console.warn('WebSocket 已连接，无法发送数据:', data);
   } else if ((wssInstance.value).readyState === WebSocket.CLOSED) {
     console.warn('WebSocket 已关闭，无法发送数据:', data);
     (wssInstance.value) = new WebSocket((wssInstance.value).url);
@@ -300,9 +300,33 @@ const wsTimeInstanceFn = () => {
   if (wsTimeInstance.value) {
     (wsTimeInstance.value).onmessage = (event) => {
       const data = JSON.parse(event.data);
-      console.log('data', data)
+      // console.log('data', data)
       startDateTime.value = data.startTime;
       endDateTime.value = data.endTime;
+      const currentEndTimeMs = selectedEndTime.value
+        ? selectedEndTime.value.getTime()
+        : null;
+      nextTick(() => {
+        // 只刷新刻度，不调 updateTimeline（它会重置滑块）
+        generateTimelineDates();
+
+        // 把滑块按比例映射到新时间范围
+        if (currentEndTimeMs) {
+          const newStartMs = new Date(data.startTime).getTime();
+          const newEndMs = new Date(data.endTime).getTime();
+          const newTotalMs = newEndMs - newStartMs;
+
+          if (newTotalMs > 0) {
+            // 当前时间在新范围中的百分比位置
+            const newPercent = ((currentEndTimeMs - newStartMs) / newTotalMs) * 100;
+            // 限制在 0~100
+            endHandlePercent.value = Math.max(0, Math.min(100, newPercent));
+          }
+        }
+
+        // 同步选中时间
+        updateSelectedTimes();
+      });
     }
   }
 }
@@ -326,6 +350,7 @@ const wssMessageHandle = () => {
     console.log('data', data)
     if (data.type === "realtime") {
       playForward();
+      useAppStoreInstance.setGlobalLeftWssCONTINE(data);
     }
     // 只有history和实时模式数据，回复已收到数据的确认。要修改以下代码
     if ((data.type === 'history' && !(data?.isLagrangeInterpolation === true))) {
@@ -526,7 +551,7 @@ const dateRange = ref([]);
 
 // 滑块位置（百分比）
 const startHandlePercent = ref(0);
-const endHandlePercent = ref(100);
+const endHandlePercent = ref(0);
 
 // 拖动状态
 const isDragging = ref(false);
@@ -579,9 +604,6 @@ const pick_select_date_handFn = (val) => {
     // window.ue5("callBackTimeFn", String(JSON.stringify({
     //   taskCode:String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
     // })));
-    // wssOpenHandle({
-    //   taskCode:String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
-    // })
   }
   pick_select_date.value = val;
   //console.log("dddddd",val);
@@ -774,8 +796,15 @@ watch(() => isDateRangeNotEmpty.value, (newVal) => {
 
 const autoHandleDateRangeChange = (val) => {
   if (val && val.length === 2) {
-    startDateTime.value = val[0].toISOString();
-    endDateTime.value = val[1].toISOString();
+    // console.log("自动更新日期范围", val);
+    if (val[0] instanceof Date && val[1] instanceof Date) {
+      startDateTime.value = val[0]?.toISOString();
+      endDateTime.value = val[1]?.toISOString();
+      // console.log("自动更新日期范围格式正确", val);
+    } else {
+      // console.log("自动更新日期范围格式错误", val);
+      return;
+    }
     isDraged.value = false;
     updateTimeline();
   }
@@ -1386,9 +1415,9 @@ const endDrag = () => {
   hasPlayed.value = false;
 
   if (window.ue5) {
-    // console.log(window.ue5, "拖动结束", isDraged.value,is_flag_isRealtime.value);
+    console.log(window.ue5, "拖动结束", isDraged.value,is_flag_isRealtime.value,useAppStoreInstance.globalLeftWssCONTINE);
     if (isDraged.value) {
-      if (is_flag_isRealtime.value) {
+      if (is_flag_isRealtime.value || useAppStoreInstance.globalLeftWssCONTINE.type === "realtime") {
         //实时
         wssOpenHandle({
           isRealtime: true,

src/pages/lefts/index.vue

@@ -859,9 +859,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
 
     // 地面数据，上层数据
     groundMetrics.value = wssTransformGroundSatelliteData(JSONdata.groundSystem)
-
-
-
     primitiveFaultData.value = []
     primitiveFaultData.value = wssTransformgroudSatelliteData(JSONdata.deviceFaultCondition)
     faultData.value = primitiveFaultData.value
@@ -916,6 +913,7 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
     // 地面数据，上层数据
     groundMetrics.value = wssTransformGroundSatelliteData(JSONdata.groundSystem)
     // 地面数据，下层数据
+    console.log("此时的groundMetrics", groundMetrics.value);
 
 
     primitiveFaultData.value = []

src/pages/lefts2/index.vue

@@ -1255,6 +1255,27 @@ watch(() => useAppStoreInstance.subsystemSocketContent, (newVal, oldValue) => {
 
 onMounted(() => {
   currentTelemetryData.value = {}
+  window.ue.interface.ClickModel = (res) => {
+    const resData = JSON.parse(res);
+    console.log("我是handleUEMessage,收到UE交互:", resData);
+    switch (resData.type) {
+      case "热控系统":
+        handleTabClick(4);
+        break;
+      case "能源分系统":
+        handleTabClick(3);
+        break;
+      case "综电分系统":
+        handleTabClick(0);
+        break;
+      case "载荷分系统":
+        handleTabClick(1);
+        break;
+      case "姿轨控分系统":
+        handleTabClick(2);
+        break;
+    }
+  }
   // (subWssInstance.value) = new WebSocket(wss.url);
   nextTick(() => {