fix:修复分页错误

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

@@ -30,7 +30,7 @@
         </div>
 
         <div class="btns">
-          <el-button plain type="primary" @click="handleSearch">查询</el-button>
+          <el-button plain type="primary" @click="getData">查询</el-button>
           <el-button plain @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -631,21 +631,6 @@ const resetForm = () => {
 // 获取esa数据列表的方法
 const getData = async () => {
   tableLoading.value = true;
-  const res = await getESAList({ page: pageObj.value.pageNo, size: pageObj.value.pageSize });
-  pageObj.value.total = res.data.total;
-  tableData.value = res.data.list;
-  console.log(tableData.value);
-
-  tableLoading.value = false;
-};
-const handleClose = () => {
-  detailVisibleValue.value = false;
-};
-const handleSearch = async () => {
-  if (searchTargetName.value === "" && searchStation.value === "" && searchTimeValue.value === "") {
-    ElMessage.warning("请输入搜索内容");
-    return;
-  }
   const res = await getESAList({
     spacecraft: searchTargetName.value,
     station: searchStation.value,
@@ -655,7 +640,12 @@ const handleSearch = async () => {
   });
   pageObj.value.total = res.data.total;
   tableData.value = res.data.list;
+  tableLoading.value = false;
 };
+const handleClose = () => {
+  detailVisibleValue.value = false;
+};
+
 onMounted(() => {
   getData();
 });

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

@@ -29,7 +29,7 @@
           </div>
         </div>
         <div class="btns">
-          <el-button plain type="primary" @click="handleSearch">查询</el-button>
+          <el-button plain type="primary" @click="getData">查询</el-button>
           <el-button plain="" @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -87,7 +87,12 @@
         label="是否确认使用"
         show-overflow-tooltip
       />
-      <el-table-column property="regulatory_status.resumption_list" width="140" label="是否暂停使用" show-overflow-tooltip />
+      <el-table-column
+        property="regulatory_status.resumption_list"
+        width="140"
+        label="是否暂停使用"
+        show-overflow-tooltip
+      />
       <el-table-column width="180" property="crawl_time" label="采集时间" show-overflow-tooltip />
       <el-table-column label="操作" width="60">
         <template #default="scope">
@@ -349,23 +354,7 @@ const resetForm = () => {
 };
 const getData = async () => {
   tableLoading.value = true;
-  const res = await getItuList({ page: pageObj.value.pageNo, size: pageObj.value.pageSize });
-  pageObj.value.total = res.data.total;
-  tableData.value = res.data.list;
-  console.log(tableData.value);
-
-  tableLoading.value = false;
-};
-const handleClose = () => {
-  detailVisibleValue.value = false;
-};
-const handleSearch = async () => {
-  if (searchTargetName.value === "" && searchTargetId.value === "" && searchTimeValue.value === "") {
-    ElMessage.warning("请输入搜索内容");
-    return;
-  }
-  tableLoading.value = true;
-  const res = await getItuList({
+  const res = await await getItuList({
     sat_name: searchTargetName.value,
     ntc_id: searchTargetId.value,
     times: searchTimeValue.value,
@@ -376,6 +365,9 @@ const handleSearch = async () => {
   tableData.value = res.data.list;
   tableLoading.value = false;
 };
+const handleClose = () => {
+  detailVisibleValue.value = false;
+};
 
 onMounted(() => {
   getData();

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

@@ -29,7 +29,7 @@
           </div>
         </div>
         <div class="btns">
-          <el-button plain type="primary" @click="handleSearch">查询</el-button>
+          <el-button plain type="primary" @click="getData">查询</el-button>
           <el-button plain @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -310,21 +310,6 @@ const resetForm = () => {
 // 获取st数据列表的方法
 const getData = async () => {
   tableLoading.value = true;
-  const res = await getStList({ page: pageObj.value.pageNo, size: pageObj.value.pageSize });
-  pageObj.value.total = res.data.total;
-  tableData.value = res.data.list;
-  console.log(tableData.value);
-
-  tableLoading.value = false;
-};
-const handleClose = () => {
-  detailVisibleValue.value = false;
-};
-const handleSearch = async () => {
-  if (searchTargetName.value === "" && noradCatId.value === "" && timeValue.value === "") {
-    ElMessage.warning("请输入搜索内容");
-    return;
-  }
   const res = await getStList({
     norad_cat_id: noradCatId.value,
     object_name: searchTargetName.value,
@@ -332,9 +317,14 @@ const handleSearch = async () => {
     page: pageObj.value.pageNo,
     size: pageObj.value.pageSize,
   });
-  tableData.value = res.data.list;
   pageObj.value.total = res.data.total;
+  tableData.value = res.data.list;
+  tableLoading.value = false;
 };
+const handleClose = () => {
+  detailVisibleValue.value = false;
+};
+
 onMounted(() => {
   getData();
 });

src/views/os-taskRecord/index.vue

@@ -81,7 +81,7 @@
           :total="pageObj.total"
           v-model:page="pageObj.pageNo"
           v-model:limit="pageObj.pageSize"
-          @pagination="getData"
+          @pagination="searchData"
           v-model:pagerCount="pageObj.pagerCount"
         />
       </div>
@@ -178,7 +178,6 @@ const getData = async () => {
   });
   pageObj.value.total = res.data.total;
   tableData.value = res.data.list;
-  console.log(tableData.value);
   tableLoading.value = false;
 };