fix:调整数据展示页面搜索栏NoradCatID字段搜索条件位置

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

@@ -8,6 +8,10 @@
             <el-input placeholder="请输入目标名称" v-model="searchTargetName" style="width: 180px" />
           </div>
           <div>
+            <span style="color: white">站点名称：</span>
+            <el-input placeholder="请输入" v-model="searchStation" style="width: 170.5px" />
+          </div>
+          <div>
             <span style="color: white">采集时间：</span>
             <el-config-provider :locale="zhCn">
               <el-date-picker
@@ -23,12 +27,7 @@
               />
             </el-config-provider>
           </div>
-          <div>
-            <span style="color: white">站点名称：</span>
-            <el-input placeholder="请输入" v-model="searchStation" style="width: 170.5px" />
-          </div>
         </div>
-
         <div class="btns">
           <el-button plain type="primary" @click="getData">查询</el-button>
           <el-button plain @click="resetForm">重置</el-button>

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

@@ -4,6 +4,10 @@
       <div class="form-content">
         <div class="left">
           <div>
+            <span style="color: white">Norad Cat ID：</span>
+            <el-input placeholder="请输入ID" style="width: 170.5px" v-model="noradCatId" />
+          </div>
+          <div>
             <span style="color: white">目标名称：</span>
             <el-input placeholder="请输入目标名称" style="width: 180px" v-model="searchTargetName" />
           </div>
@@ -23,10 +27,6 @@
               />
             </el-config-provider>
           </div>
-          <div>
-            <span style="color: white">Norad Cat ID：</span>
-            <el-input placeholder="请输入ID" style="width: 170.5px" v-model="noradCatId" />
-          </div>
         </div>
         <div class="btns">
           <el-button plain type="primary" @click="getData">查询</el-button>
@@ -214,159 +214,159 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
-import Pagination from "@/components/pagination/index.vue";
-import exportDialog from "@/components/Export/index.vue";
-import { getStList, getStDetail } from "@/api/spiderData";
-import { ElMessage } from "element-plus";
+import { onMounted, ref } from 'vue'
+import Pagination from '@/components/pagination/index.vue'
+import exportDialog from '@/components/Export/index.vue'
+import { getStList, getStDetail } from '@/api/spiderData'
+import { ElMessage } from 'element-plus'
 // ElConfigProvider 组件
-import { ElConfigProvider } from "element-plus";
-import TableSearch from "@/components/TableSearch.vue";
+import { ElConfigProvider } from 'element-plus'
+import TableSearch from '@/components/TableSearch.vue'
 // 引入中文包
-import zhCn from "element-plus/es/locale/lang/zh-cn";
-defineOptions({ name: "Pagination" });
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
+defineOptions({ name: 'Pagination' })
 // 更改分页文字
-zhCn.el.pagination.total = "共 `{total} 条`";
-zhCn.el.pagination.goto = "跳至";
-zhCn.el.pagination.pagesize = "条/页";
-zhCn.el.pagination.pageClassifier = "页";
-const searchTargetName = ref("");
-const noradCatId = ref("");
-const showDeleteDialog = ref(false);
-const timeValue = ref("");
-const detailVisibleValue = ref(false);
+zhCn.el.pagination.total = '共 `{total} 条`'
+zhCn.el.pagination.goto = '跳至'
+zhCn.el.pagination.pagesize = '条/页'
+zhCn.el.pagination.pageClassifier = '页'
+const searchTargetName = ref('')
+const noradCatId = ref('')
+const showDeleteDialog = ref(false)
+const timeValue = ref('')
+const detailVisibleValue = ref(false)
 // NoradCatID
-const NoradCatID = ref("");
+const NoradCatID = ref('')
 // 目标名称
-const targetName = ref("");
-const objectType = ref("");
+const targetName = ref('')
+const objectType = ref('')
 // INTLDES
-const intleds = ref("");
+const intleds = ref('')
 // 类型
-const type = ref("");
+const type = ref('')
 // 记录时间
-const recordTime = ref("");
+const recordTime = ref('')
 // 所属国家
-const belongCountry = ref("");
+const belongCountry = ref('')
 // 近地点
-const perigee = ref("");
+const perigee = ref('')
 // 远地点
-const apogee = ref("");
+const apogee = ref('')
 // 周期
-const period = ref("");
+const period = ref('')
 // RCS
-const rcs = ref("");
+const rcs = ref('')
 // SITE
-const site = ref("");
+const site = ref('')
 // TLE
-const tle = ref("");
+const tle = ref('')
 //近地点幅角
-const argOfPericenter = ref("");
+const argOfPericenter = ref('')
 //弹道系数
-const bStar = ref("");
+const bStar = ref('')
 //备注
-const comment = ref("");
+const comment = ref('')
 //偏心率 ECCENTRICITY
-const eccentricity = ref("");
+const eccentricity = ref('')
 //倾斜角 INCLINATION
-const inclination = ref("");
+const inclination = ref('')
 //升交点赤经 RA_OF_ASC_NODE
-const raOfAscNode = ref("");
+const raOfAscNode = ref('')
 //平近点角 MEAN_ANOMALY
-const meanAnomaly = ref("");
+const meanAnomaly = ref('')
 //RCS_SIZE
-const rcsSize = ref("");
+const rcsSize = ref('')
 //LAUNCH_DATE
-const launchDate = ref("");
-const countryCode = ref("");
-const meanMotionDot = ref("");
-const meanMotionDdot = ref("");
-const revAtEpoch = ref("");
+const launchDate = ref('')
+const countryCode = ref('')
+const meanMotionDot = ref('')
+const meanMotionDdot = ref('')
+const revAtEpoch = ref('')
 
 //半长轴SEMIMAJOR_AXIS
-const semimajorAxis = ref("");
+const semimajorAxis = ref('')
 //第一行数据 TLE_LINE0
-const tleLine0 = ref("");
+const tleLine0 = ref('')
 //第二行数据 TLE_LINE0
-const tleLine1 = ref("");
+const tleLine1 = ref('')
 //第三行数据 TLE_LINE0
-const tleLine2 = ref("");
+const tleLine2 = ref('')
 
-const tableData = ref([]);
+const tableData = ref([])
 const pageObj = ref({
   total: 10,
   pageSize: 10,
-  pageNo: 1,
-});
+  pageNo: 1
+})
 // 查看数据详情的方法
 const handleDetails = async (row: any) => {
-  const res = await getStDetail({ id: row._id });
-  console.log(res);
+  const res = await getStDetail({ id: row._id })
+  console.log(res)
 
-  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;
+  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;
-  countryCode.value = res.data.COUNTRY_CODE;
-  meanMotionDot.value = res.data.MEAN_MOTION_DOT;
-  meanMotionDdot.value = res.data.MEAN_MOTION_DDOT;
-  revAtEpoch.value = res.data.REV_AT_EPOCH;
-  objectType.value = res.data.OBJECT_TYPE;
-};
+${res.data.TLE_LINE2}`
+  detailVisibleValue.value = true
+  countryCode.value = res.data.COUNTRY_CODE
+  meanMotionDot.value = res.data.MEAN_MOTION_DOT
+  meanMotionDdot.value = res.data.MEAN_MOTION_DDOT
+  revAtEpoch.value = res.data.REV_AT_EPOCH
+  objectType.value = res.data.OBJECT_TYPE
+}
 //表单loading标记
-const tableLoading = ref(false);
+const tableLoading = ref(false)
 //重置搜索条件
 const resetForm = () => {
-  noradCatId.value = "";
-  searchTargetName.value = "";
-  timeValue.value = "";
-  getData();
-};
+  noradCatId.value = ''
+  searchTargetName.value = ''
+  timeValue.value = ''
+  getData()
+}
 // 获取st数据列表的方法
 const getData = async () => {
-  tableLoading.value = true;
+  tableLoading.value = true
   const res = await getStList({
     norad_cat_id: noradCatId.value,
     object_name: searchTargetName.value,
     times: timeValue.value,
     page: pageObj.value.pageNo,
-    size: pageObj.value.pageSize,
-  });
-  pageObj.value.total = res.data.total;
-  tableData.value = res.data.list;
-  tableLoading.value = false;
-};
+    size: pageObj.value.pageSize
+  })
+  pageObj.value.total = res.data.total
+  tableData.value = res.data.list
+  tableLoading.value = false
+}
 const handleClose = () => {
-  detailVisibleValue.value = false;
-};
+  detailVisibleValue.value = false
+}
 
 onMounted(() => {
-  getData();
-});
+  getData()
+})
 </script>
 
 <style scoped lang="scss">
@@ -386,7 +386,7 @@ onMounted(() => {
 
 /* 工具栏样式 */
 .toolbarStyle {
-  background-image: url("@/assets/picture/box3.png");
+  background-image: url('@/assets/picture/box3.png');
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }

src/views/os-taskRecord/index.vue

@@ -192,11 +192,9 @@ const getTaskList = async () => {
   jobNameOptions.value = taskList.value
     .filter((task: any) => task.id)
     .map((task: any) => ({
-      label: task.kwargs.spider,
+      label: JSON.parse(task.kwargs.options).jobName,
       value: task.id
     }))
-
-  console.log(taskList.value)
 }
 
 // 获取任务执行记录列表