Merge branch 'master' of http://94.191.59.107:3000/houwenfeng/scd_tools_ui

src/pages/mission/components/HistoryMis.vue

@@ -88,7 +88,7 @@ export default {
         let loading = ref(false)
         function reload() {
             loading.value = true
-            task.getTask({ pageno: 1, pagesize: 10 }).then(res => {
+            task.getTask({ pageno: pageNum.value - 0, pagesize: pageSize.value - 0 }).then(res => {
                 if (res.code == 0) {
                     tableData.value = res.data.sort((a, b) => {
                         // 将日期字符串转换为 Date 对象进行比较
@@ -160,6 +160,8 @@ export default {
             delModal.value = true
         }
         function relady(row) {
+            // pageNum.value = 1
+            // pageSize.value = 10
             task.reladyTask({
                 id: row.id
             }).then(res => {
@@ -188,10 +190,15 @@ export default {
         }
         // 分页组件返回的页码
         function currentBack(data) {
+            loading.value = true
             pageNum.value = data
+            setTimeout(() => {
+                loading.value = false
+            }, 1000)
         }
         // 分页组件返回的每页多少条
         function sizeBack(data) {
+            console.log(data, 'sdasd');
             pageSize.value = data
         }
         onMounted(() => {

src/pages/mission/components/PageNation.vue

@@ -54,6 +54,7 @@ export default {
         }
         function handleSizeChange(e) {//每页条数
             pageSize.value = e
+            emit("sizeBack", pageSize.value)
             task.getTask({
                 pageno: currentPage.value - 0,
                 pagesize: pageSize.value - 0
@@ -67,7 +68,6 @@ export default {
                     return dateB - dateA;
                 });
                 emit("pageBack", arr)
-                emit("sizeBack", pageSize.value)
             })
         }
         function handleCurrentChange(e) {//页码