Merge branch 'dev/z' into dev/L

src/pages/all/index.vue

@@ -488,16 +488,6 @@ onUnmounted(() => {
   height: 100%;
 }
 
-.left-aside {
-  /* order: 1; */
-  /* border-right: 1px solid var(--border-color); */
-}
-
-.right-aside {
-  /* order: 4; */
-  /* border-left: 1px solid var(--border-color); */
-}
-
 .main-container {
   /* flex: 1; */
   /* order: 2; */
@@ -509,6 +499,8 @@ onUnmounted(() => {
   margin: 0 auto;
   max-width: 1600px;
   position: relative;
+  height: 30vh;
+  margin-top: 69vh;
 }
 
 .el-footer {
@@ -553,10 +545,6 @@ onUnmounted(() => {
   /* bottom: 10px; */
 }
 
-.footer-content-down {
-  /* height: 50px; */
-}
-
 .main-footer .footer-content:last-child {
   border-bottom: none;
   padding-bottom: 0;

src/pages/footer/component/timers.vue

@@ -441,11 +441,6 @@ const wssMessageHandle = () => {
       // 处理任务数据
     }
     if (data.type === 'history' && !(data?.isLagrangeInterpolation === true)) {
-      // if (useAppStoreInstance.footerTimeHasedSelectTimeToSub && !subSysToMainSysFirstDataBack.value) {
-      //   jumpToSpecificTime(new Date(tempDateTime.value),false)
-      //   // jumpToSpecificTime(new Date(subtractSecondsAndFormat(alignTo56Seconds(tempDateTime.value).toISOString(),0)),true)
-      //   subSysToMainSysFirstDataBack.value = true;
-      // }
       useAppStoreInstance.setGlobalLeftWssCONTINE(data);
       // 处理日志数据
       // //console.log("endDateTime.value === selectedEndTime.value:", endDateTime.value , selectedEndTime.value.toISOString(),endDateTime.value === selectedEndTime.value);
@@ -462,11 +457,6 @@ const wssMessageHandle = () => {
         is_flag_confirmAndPauseAndSpeed.value = true;
       }
 
-
-      // 跳转到上次时间点
-      //        if (useAppStoreInstance.footerTimeHasedSelectTimeToSub) {
-      //          jumpToSpecificTime(new Date(useAppStoreInstance.globalTimeLineEndSelectTime),true) 
-      //        }
       preTimeAllDate.value = data;
       // clearTimeout(WwflagToNext);
       if (flagToNext !== 0) {
@@ -618,15 +608,6 @@ const taskCode_everyChange = ref('');
 
 // 点击确认后，处理日期范围变化
 const handleDateRangeChange = async (val, flag = false) => {
-  //console.log("0000000.02222",val,typeof val,flag);
-  // if(typeof val !== 'object') { 
-  //     ElMessage({
-  //       message: '请选择正确的日期范围',
-  //       type: 'warning',
-  //     })
-  //     dateRange.value = [];
-  //   return;
-  // }
   jiangerTime.value = 0;
   isChange_flag_firstBackDate.value = false;
   hasPlayed.value = false;
@@ -798,6 +779,7 @@ watch(() => isDateRangeNotEmpty.value, (newVal) => {
 });
 
 const autoHandleDateRangeChange = (val) => {
+  useAppStoreInstance.setglobalSubsystemSelectedStartTime(val);
   if (val && val.length === 2) {
     // console.log("自动更新日期范围", val);
     if (val[0] instanceof Date && val[1] instanceof Date) {
@@ -1465,7 +1447,6 @@ const endDrag = () => {
 
       // }
     } else {
-      // window.ue5("callBackTimeFn", String(JSON.stringify({})));
     }
   }
 
@@ -1603,10 +1584,6 @@ onMounted(() => {
     if (window.ue5) {
 
       window.ue5("callBackTimeFn", String(JSON.stringify({
-        // isRealtime:"false",
-        // startTime:"2025-11-03 00:00:00",
-        // endTime:"2025-11-04 00:00:00",
-        // taskCode:"1111111111"
         isRealtime: is_flag_isRealtime.value,
         taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
         speed: playbackSpeed.value,
@@ -1622,16 +1599,7 @@ onMounted(() => {
   console.log('isPlaying', isPlaying.value)
   if (!isPlaying.value) {
     if (window.ue5) {
-      // startAutoPlay()
-      // taskCode_everyChange.value = String(Date.now());
-      // useAppStoreInstance.setglobalSubsystemTaskCode(taskCode_everyChange.value);
-      // useAppStoreInstance.setGlobalRecordMainSysTaskCode(taskCode_everyChange.value)
-      // useAppStoreInstance.setFooterTimeHasedSelectTimeToSub(true);
       isChange_flag_select_date.value = true
-      // const startTime = formatDateTime(new Date(startDateTime.value))
-      // const endTime = formatDateTime(new Date(endDateTime.value))
-      // console.log('startTime',startTime)
-      // console.log('endTime',endTime)
       realTimeData()
 
     }
@@ -1653,9 +1621,6 @@ const realTimeData = () => {
   })
 
   if (window.ue5) {
-    // console.log('1', dayjs(startDateTime.value).format('YYYY-MM-DD HH:mm'))
-    // console.log('2', dayjs(endDateTime.value).format('YYYY-MM-DD HH:mm'))
-    // console.log('3', dayjs(selectedEndTime.value).format('YYYY-MM-DD HH:mm'))
     window.ue5("callBackTimeFn", String(JSON.stringify({
       isRealtime: is_flag_isRealtime.value ? true : false,
       startTime: dayjs(startDateTime.value).format('YYYY-MM-DD HH:mm'),
@@ -1785,12 +1750,6 @@ onUnmounted(() => {
 
 
       })));
-
-      // window.ue5("callBackTimeFn", String(JSON.stringify({
-      //     isRealtime: is_flag_isRealtime.value? true: false,
-      //     status: "stop",
-      //     taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
-      //   })));
       wssOpenHandle({
         isRealtime: is_flag_isRealtime.value ? true : false,
         status: "stop",

src/pages/header/index.vue

@@ -177,11 +177,6 @@ const handletoLinkClick = () => {
       router.push(
         {
           name: 'subsystem',
-          // query: {
-          //   startTime:useAppStoreInstance.globalSubsystemSelectedStartTime,
-          //   endTime:useAppStoreInstance.globalSubsystemSelectedEndTime,
-          //   disabled:true
-          // }
         }
       );
     }
@@ -224,16 +219,9 @@ const getGridInfoListData = async () => {
 
 onMounted(async () => {
   // window.addEventListener('message', handleUEMessage);
-  // window.addEventListener('emitUIInteraction', handleUEMessage1);
   await getGridInfoListData()
   window.ue.interface.emitUIInteraction = (res) => {
-    //    if (window.ue5) {
-    //     window.ue5("callBackTimeFn", `ue传递给vue的数据111111111111111111:${JSON.stringify(res)},${JSON.stringify(res.locationReplace)}`)
-    // }
     const resData = JSON.parse(res);
-    //  if (window.ue5) {
-    //     window.ue5("callBackTimeFn", `测试数据111111111111111111:${JSON.stringify(resData)},${JSON.stringify(resData.locationReplace)},${JSON.stringify(resData.locationReplace === 'true')}`)
-    // }
     console.log("我是handleUEMessage,收到UE交互:", resData);
 
     if (resData.locationReplace === 'true') {
@@ -264,30 +252,8 @@ onMounted(async () => {
       useAppStoreInstance.setiscontrolPanelShow(true);
       useAppStoreInstance.setGlobalSubsystemSelectedTimeRange([]);
     }
-    //  try {
-    //   const resData = JSON.parse(res.data);
-    //   if (window.ue5) {
-    //     window.ue5("callBackTimeFn", `ue传递给vue的数据111111111111111111:${JSON.stringify(res)}`)
-    // }
-    //   //console.log("Received from UE:", resData);
-
-    //   if (resData.locationReplace === true) {
-    //      router.push('/subsystem');
-    //   }
-    //   if (resData.locationReplace === false) {
-    //      router.push('/');
-    //   }
-    // } catch (parseError) {
-    //   console.error("Error parsing JSON:", parseError);
-    // }
   }
-
-
-
   await initChartData();
-
-
-
 });
 
 

src/pages/lefts/index.vue

@@ -135,12 +135,12 @@
         </div>
 
         <el-table :data="satelliteData" size="small" :height="pxScale(170)" class="custom-table">
-          <el-table-column prop="" label="" :width="pxScale(30)" >
+          <el-table-column prop="" label="" :width="pxScale(30)">
             <template #default="">
               <img src='@/assets/images/lefts/satellite.png' alt="" class="satellite-icon">
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="卫星名称":width="pxScale(80)" align="center"></el-table-column>
+          <el-table-column prop="name" label="卫星名称" :width="pxScale(80)" align="center"></el-table-column>
           <el-table-column prop="station" label="当前连接" :width="pxScale(80)" align="center">
             <template #default="scope">
               <div v-if="scope.row.station.length !== 0">
@@ -333,32 +333,33 @@ const handleglobaleAutoPlayChange = (value) => {
 
 
 const activeTabHandleClickTab = (value) => {
-  //console.log("yongdainji");
+  console.log(searchEquipmentValue.value, value, "yongdainji", useAppStoreInstance.globalStartWss);
   activeTab.value = value
   if (!useAppStoreInstance.globalStartWss) {
 
     if (value === 'fault') {
-      siteDataPageErrorInfoApi({
-        pageNum: 0,
-        pageSize: -1,
-      }).then(res => {
-        primitiveFaultData.value = transformgroudSatelliteData(res.data)
+      // siteDataPageErrorInfoApi({
+      //   pageNum: 0,
+      //   pageSize: -1,
+      // }).then(res => {
+      //   primitiveFaultData.value = transformgroudSatelliteData(res.data)
+      //   console.log(res.data);
 
       faultData.value = primitiveFaultData.value
-        if (searchEquipmentValue.value !== '') {
+      // if (searchEquipmentValue.value !== '') {
       searchEquipmentList()
-        }
-      })
+      // }
+      // })
     }
     if (value === 'equipment') {
-      siteDataInfoListApi().then(res => {
-        primitiveSatelliteData.value = transformgroudSatelliteData(res.data)
+      // siteDataInfoListApi().then(res => {
+      // primitiveSatelliteData.value = transformgroudSatelliteData(res.data)
       equipmentData.value = primitiveSatelliteData.value
-        if (searchEquipmentValue.value !== '') {
+      // if (searchEquipmentValue.value !== '') {
       searchEquipmentList()
-        }
+      // }
 
-      })
+      // })
     }
   }
 
@@ -920,9 +921,9 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
     primitiveFaultData.value = wssTransformgroudSatelliteData(JSONdata.deviceFaultCondition)
     faultData.value = primitiveFaultData.value
     //console.log("此时的fault", primitiveFaultData.value);
-    if (searchEquipmentValue.value !== '') {
+    // if (searchEquipmentValue.value !== '') {
     searchEquipmentList()
-    }
+    // }
 
 
     primitiveEquipmentData.value = []
@@ -930,9 +931,9 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
     //console.log("此时的equipment", primitiveEquipmentData.value);
 
     equipmentData.value = primitiveEquipmentData.value
-      if (searchEquipmentValue.value !== '') {
+    // if (searchEquipmentValue.value !== '') {
     searchEquipmentList()
-      }
+    // }
 
   }
   tempCount.value++

src/pages/lefts2/index.vue

@@ -1257,7 +1257,7 @@ onMounted(() => {
   currentTelemetryData.value = {}
   window.ue.interface.ClickModel = (res) => {
     const resData = JSON.parse(res);
-    console.log("我是handleUEMessage,收到UE交互:", resData);
+    console.log("我是ClickModel,收到UE交互:", resData);
     switch (resData.type) {
       case "热控系统":
         handleTabClick(4);
@@ -1334,6 +1334,7 @@ onUnmounted(() => {
   gap: 20px;
   overflow-y: auto;
   background-color: #010102;
+  z-index: 100000 !important;
 }
 
 .equipment-panel_header11 {

src/router/index.js

@@ -49,11 +49,6 @@ export const constantRoutes = [
             path: '/subsystem',
             name: 'subsystem',
             props: true,
-            // meta: {
-            //   startTime: useAppStoreInstance.globalSubsystemSelectedStartTime,
-            //   endTime: useAppStoreInstance.globalSubsystemSelectedEndTime,
-            //   disabled:true
-            // },
             components: {
               // foot_two: ()=> import('@/pages/footer/component/legend.vue'), // 主内容
               foot_two: () => import('@/pages/footer2/timers.vue'),