Merge branch 'yzh' into 'main'

Yzh

See merge request !40

src/api/staticData.ts

@@ -8,7 +8,8 @@ export function getStatsDataList(params: QueryParams): Promise<ApiResponse> {
     url: dataApi.dataStatistics,
     method: POST,
     params,
-  }) as unknown as Promise<ApiResponse>;
+    timeout: 60000, // 一分钟
+  } as any) as unknown as Promise<ApiResponse>;
 }
 
 // 获取爬虫任务列表

src/utils/request.ts

@@ -5,7 +5,7 @@ import { getToken, removeToken } from '@/utils/auth'
 // 创建axios实例
 const instance = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API || '',
-  timeout: 10000, // 毫秒
+  timeout: 100000, // 毫秒
   headers: {
     'Content-Type': 'application/zip; charset=utf-8'
   }

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

@@ -37,10 +37,15 @@
       element-loading-background="rgba(48, 65, 86, 0.7)">
       <!-- <el-table-column type="selection" width="40" /> -->
       <el-table-column property="number" label="序号" width="53" type="index" />
-      <el-table-column property="item.ntc_id" label="SNS Notice ID" show-overflow-tooltip />
+      <el-table-column property="item.sns_notice_id" label="SNS Notice ID" show-overflow-tooltip />
       <el-table-column min-width="100" property="identity.adm_name_e" label="主管部门" show-overflow-tooltip />
       <el-table-column property="identity.sat_name" label="目标名称" show-overflow-tooltip />
-      <el-table-column property="item.plan_txt" label="计划/非计划类型" show-overflow-tooltip />
+      <!-- <el-table-column property="item.plan_nonplan" label="计划/非计划类型" show-overflow-tooltip /> -->
+      <el-table-column property="item.plan_nonplan" label="计划/非计划类型" show-overflow-tooltip>
+        <template #default="scope">
+          {{ scope.row.item.plan_nonplan === 'true' ? '计划类型' : '非计划类型' }}
+        </template>
+      </el-table-column>
       <el-table-column property="identity.ntc_type" label="是否为同步" show-overflow-tooltip>
         <template #default="scope">
           {{ scope.row.identity.ntc_type === 'G' ? '是' : '否' }}
@@ -62,7 +67,7 @@
         </template>
       </el-table-column>
       <el-table-column property="regulatory_status.active_status" label="状态" show-overflow-tooltip />
-      <el-table-column property="regulatory_status.prd_valid" label="有效期" show-overflow-tooltip />
+      <!-- <el-table-column property="regulatory_status.prd_valid" label="有效期" show-overflow-tooltip /> -->
       <el-table-column property="regulatory_status.d_reg_limit" label="最早使用日期" show-overflow-tooltip>
         <template #default="scope">
           {{ scope.row.regulatory_status.d_reg_limit === null ? '-' : scope.row.regulatory_status.d_reg_limit }}
@@ -99,10 +104,10 @@
               <span class="item-title">卫星网络名称：</span>
               <span class="item">{{ targetName }}</span>
             </div>
-            <div class="info-item">
+            <!-- <div class="info-item">
               <span class="item-title">主管部门：</span>
               <span class="item">{{ department }}({{ departmentDetail }})</span>
-            </div>
+            </div> -->
             <div class="info-item">
               <span class="item-title">网络组织：</span>
               <span class="item">{{ ntwkOrg ?? '--' }}</span>
@@ -137,10 +142,6 @@
               <span class="item">{{ isUsed }}</span>
             </div>
             <div class="info-item">
-              <span class="item-title">是否暂停使用：</span>
-              <span class="item">{{ isPauseUsed }}</span>
-            </div>
-            <div class="info-item">
               <span class="item-title">最早监管日期：</span>
               <span class="item">{{ earliestRegulatoryDate }}</span>
             </div>
@@ -167,10 +168,10 @@
               <span class="item-title">最高频率：</span>
               <span class="item">{{ highestFrequency }}</span>
             </div>
-            <div class="info-item">
+            <!-- <div class="info-item">
               <span class="item-title">最低海拔：</span>
               <span class="item">{{ lowestAltitude }}</span>
-            </div>
+            </div> -->
           </el-card>
           <!-- 其他信息 -->
           <el-card>
@@ -184,10 +185,10 @@
               <span class="item-title">同步位置：</span>
               <span class="item">{{ syncPosition }}</span>
             </div>
-            <div class="info-item">
+            <!-- <div class="info-item">
               <span class="item-title">参考主体：</span>
               <span class="item">{{ referenceSubject }}</span>
-            </div>
+            </div> -->
             <div class="info-item">
               <span class="item-title">是否恢复使用：</span>
               <span class="item">{{ isRestoreUsed }}</span>
@@ -196,6 +197,10 @@
               <span class="item-title">最新相关 BR IFIC 发布日期：</span>
               <span class="item">{{ BFIFICdate }}</span>
             </div>
+            <div class="info-item">
+              <span class="item-title">是否暂停使用：</span>
+              <span class="item">{{ isPauseUsed }}</span>
+            </div>
           </el-card>
         </el-col>
       </el-row>
@@ -301,12 +306,12 @@ const handleDetails = async (id: any) => {
   ntwkOrg.value = res.data.item.ntwk_org
   ntwkType.value = res.data.item.notice_type_tooltip
   targetName.value = res.data.identity.sat_name
-  planType.value = res.data.identity.plan_type
+  planType.value = res.data.identity.plan_nonplan === null ? '--' : (res.data.identity.plan_nonplan === 'true' ? '计划类型' : '非计划类型')
   syncType.value = res.data.identity.ntc_type
   isNtcType.value = res.data.item.ntc_type
   syncPosition.value = res.data.identity.long_nom === null ? '--' : res.data.identity.long_nom
-  perigee.value = res.data.item.minPerigee === null ? '--' : res.data.item.minPerigee
-  apogee.value = res.data.item.maxApog === null ? '--' : res.data.item.maxApog
+  perigee.value = res.data.item.perig === null ? '--' : res.data.item.perig
+  apogee.value = res.data.item.apog === null ? '--' : res.data.item.apog
   lowestAltitude.value = res.data.item.minAltitude === null ? '--' : res.data.item.minAltitude
   referenceSubject.value = res.data.item.ref_body === null ? '--' : res.data.item.ref_body
   lowestFrequency.value = res.data.item.freq_min === null ? '--' : res.data.item.freq_min

src/views/os-spiderManager/components/NoItem.vue

@@ -2,7 +2,7 @@
   <div class="No-Item" :class="{ selected: isSelected }" @click="selectNo">
     <!-- 新增选中标识，增强视觉反馈 -->
     <span class="selected-icon" v-if="isSelected">✓</span>
-    {{ props.No }}
+    TLE编号:{{ props.No }}
   </div>
 </template>
 

src/views/os-status/components/errorMessageChart.vue

@@ -8,7 +8,11 @@
       <div class="table-content">
         <!-- 错误详情表格 -->
         <el-table :data="curTableData" border style="width: 100%">
-          <el-table-column width="55" label="序号" type="index" />
+          <el-table-column width="55" label="序号">
+            <template #default="scope">
+              {{ (pageObj.pageNo - 1) * pageObj.pageSize + scope.$index + 1 }}
+            </template>
+          </el-table-column>
           <el-table-column width="150" property="spider" label="爬虫名称" />
           <el-table-column property="error" label="错误信息">
             <template #default="scope">

src/views/os-taskRecord/index.vue

@@ -133,8 +133,8 @@ const spideOptions = [
     value: 'dsn_now'
   },
   {
-    label: 'itu_space_expolorer',
-    value: 'itu_space_expolorer'
+    label: 'itu_space_explorer',
+    value: 'itu_space_explorer'
   },
   {
     label: 'space_track',
@@ -217,7 +217,7 @@ const searchData = async () => {
   const res = await getSpiderTaskRecord({
     page: pageObj.value.pageNo,
     size: pageObj.value.pageSize,
-    status: 'total',
+    // status: 'total',
     spider: spidername.value,
     schedule_job_id: jobname.value,
     times: resTime