Merge branch 'liucan' into 'main'

fix:修改ST数据接口字段

See merge request !24

src/App.vue

 <script setup lang="ts">
 import { ElConfigProvider } from "element-plus";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
-import { CloseBold } from "@element-plus/icons-vue";
 </script>
 
 <template>
-  <el-config-provider :locale="zhCn" :close-icon="CloseBold">
+  <el-config-provider :locale="zhCn">
     <router-view />
   </el-config-provider>
 </template>

src/views/os-dataDisplay/components/dsnData/dsnDataTab.vue

@@ -261,7 +261,14 @@ const handleRefresh = () => {
     // 保存id删除的时候用
     timerId.value = setInterval(async () => {
       const res = await getDsnList({ page: pageObj.value.pageNo, size: pageObj.value.pageSize });
-      tableData.value = res.data.list[0].dishes;
+      let dishesData = [];
+      for (let i = 0; i < res.data.list[0].stations.length; i++) {
+        for (let j = 0; j < res.data.list[0].stations[i].dishes.length; j++) {
+          dishesData.push(res.data.list[0].stations[i].dishes[j]);
+        }
+      }
+      pageObj.value.total = dishesData.length;
+      tableData.value = dishesData;
     }, 5000);
   } else {
     ElMessage.success("停止刷新");

src/views/os-dataDisplay/components/stDataTab.vue

@@ -50,19 +50,19 @@
     >
       <!-- <el-table-column type="selection" width="40" /> -->
       <el-table-column property="number" label="序号" width="55" type="index" />
-      <el-table-column property="data[0].NORAD_CAT_ID" label="Norad Cat ID" show-overflow-tooltip />
-      <el-table-column property="data[0].OBJECT_NAME" label="目标名称" show-overflow-tooltip />
+      <el-table-column property="NORAD_CAT_ID" label="Norad Cat ID" show-overflow-tooltip />
+      <el-table-column property="OBJECT_NAME" label="卫星名称" show-overflow-tooltip />
       <!-- <el-table-column property="intleds" label="INTLDES" show-overflow-tooltip /> -->
-      <el-table-column property="data[0].OBJECT_TYPE" label="类型" show-overflow-tooltip />
-      <el-table-column property="data[0].COUNTRY_CODE" label="所属国家" width="82" show-overflow-tooltip />
+      <el-table-column property="OBJECT_TYPE" label="卫星类型" show-overflow-tooltip />
+      <el-table-column property="COUNTRY_CODE" label="所属国家" width="82" show-overflow-tooltip />
       <!-- <el-table-column property="runningTime" label="运行时间" show-overflow-tooltip /> -->
-      <el-table-column property="data[0].SITE" label="SITE" show-overflow-tooltip />
+      <el-table-column property="SITE" label="卫星站点" show-overflow-tooltip />
       <!-- <el-table-column property="failTime" label="失效时间" show-overflow-tooltip /> -->
-      <el-table-column property="data[0].PERIOD" label="周期(min)" show-overflow-tooltip />
-      <el-table-column property="data[0].PERIAPSIS" label="近地点" show-overflow-tooltip />
-      <el-table-column property="data[0].APOAPSIS" label="远地点" show-overflow-tooltip />
+      <el-table-column property="PERIOD" width="118" label="轨道周期(min)" show-overflow-tooltip />
+      <el-table-column property="PERIAPSIS" label="近地点" show-overflow-tooltip />
+      <el-table-column property="APOAPSIS" label="远地点" show-overflow-tooltip />
       <!-- <el-table-column property="incl" label="INCL" show-overflow-tooltip /> -->
-      <el-table-column property="data[0].RCS_SIZE" label="RCS" show-overflow-tooltip />
+      <el-table-column property="RCS_SIZE" label="雷达截面积" show-overflow-tooltip />
       <el-table-column property="crawl_time" label="采集时间"></el-table-column>
       <el-table-column label="操作" width="60">
         <template #default="scope">
@@ -268,34 +268,33 @@ const pageObj = ref({
 // 查看数据详情的方法
 const handleDetails = async (row: any) => {
   const res = await getStDetail({ id: row._id });
-  console.log(res);
-  NoradCatID.value = res.data.data[0].NORAD_CAT_ID;
-  rcsSize.value = res.data.data[0].RCS_SIZE;
-  launchDate.value = res.data.data[0].LAUNCH_DATE;
-  semimajorAxis.value = res.data.data[0].SEMIMAJOR_AXIS;
-  targetName.value = res.data.data[0].OBJECT_NAME;
-  tleLine0.value = res.data.data[0].TLE_LINE0;
-  tleLine1.value = res.data.data[0].TLE_LINE1;
-  tleLine2.value = res.data.data[0].TLE_LINE2;
-  inclination.value = res.data.data[0].INCLINATION;
-  meanAnomaly.value = res.data.data[0].MEAN_ANOMALY;
-  eccentricity.value = res.data.data[0].ECCENTRICITY;
-  raOfAscNode.value = res.data.data[0].RA_OF_ASC_NODE;
-  comment.value = res.data.data[0].COMMENT;
-  type.value = res.data.data[0].OBJECT_TYPE;
-  argOfPericenter.value = res.data.data[0].ARG_OF_PERICENTER;
-  bStar.value = res.data.data[0].BSTAR;
-  period.value = res.data.data[0].PERIOD;
-  intleds.value = res.data.data[0].INTLDES;
-  recordTime.value = res.data.data[0].CREATION_DATE;
-  belongCountry.value = res.data.data[0].COUNTRY_CODE;
-  perigee.value = res.data.data[0].PERIAPSIS;
-  apogee.value = res.data.data[0].APOAPSIS;
-  rcs.value = res.data.data[0].RCS_SIZE;
-  site.value = res.data.data[0].SITE;
-  tle.value = `${res.data.data[0].TLE_LINE0}
-${res.data.data[0].TLE_LINE1}
-${res.data.data[0].TLE_LINE2}`;
+  NoradCatID.value = res.data.NORAD_CAT_ID;
+  rcsSize.value = res.data.RCS_SIZE;
+  launchDate.value = res.data.LAUNCH_DATE;
+  semimajorAxis.value = res.data.SEMIMAJOR_AXIS;
+  targetName.value = res.data.OBJECT_NAME;
+  tleLine0.value = res.data.TLE_LINE0;
+  tleLine1.value = res.data.TLE_LINE1;
+  tleLine2.value = res.data.TLE_LINE2;
+  inclination.value = res.data.INCLINATION;
+  meanAnomaly.value = res.data.MEAN_ANOMALY;
+  eccentricity.value = res.data.ECCENTRICITY;
+  raOfAscNode.value = res.data.RA_OF_ASC_NODE;
+  comment.value = res.data.COMMENT;
+  type.value = res.data.OBJECT_TYPE;
+  argOfPericenter.value = res.data.ARG_OF_PERICENTER;
+  bStar.value = res.data.BSTAR;
+  period.value = res.data.PERIOD;
+  intleds.value = res.data.INTLDES;
+  recordTime.value = res.data.CREATION_DATE;
+  belongCountry.value = res.data.COUNTRY_CODE;
+  perigee.value = res.data.PERIAPSIS;
+  apogee.value = res.data.APOAPSIS;
+  rcs.value = res.data.RCS_SIZE;
+  site.value = res.data.SITE;
+  tle.value = `${res.data.TLE_LINE0}
+${res.data.TLE_LINE1}
+${res.data.TLE_LINE2}`;
   detailVisibleValue.value = true;
 };
 //表单loading标记