Ver Fonte

fix: 数据修改

dulonghui há 1 ano atrás
pai
commit
ebc2a5a765
2 ficheiros alterados com 75 adições e 41 exclusões
  1. 44 39
      src/components/ResultPage.vue
  2. 31 2
      src/views/HomeView.vue

+ 44 - 39
src/components/ResultPage.vue

@@ -87,19 +87,22 @@ import {saveAs} from 'file-saver'
 import {getToken} from '@/utils/auth'
 
 const props = defineProps({
-  taskDetail: Object
+  taskDetail: Object,
+  taskList: Object,
+  totalNum: Number
 })
-const emit = defineEmits(['taskDetail'])
+const emit = defineEmits(['taskDetail', 'getTaskList'])
+
 let isShowResult = ref(false)
 let resultData = reactive({})
 let queryParams = reactive({
   pageIndex: 1,
   pageSize: 6
 })
-let taskList = reactive({
-  list: []
-})
-let totalNum = ref(0)
+// let taskList = reactive({
+//   list: []
+// })
+// let totalNum = ref(0)
 
 function sleepFun(logStr) {
   return new Promise((res) => {
@@ -109,31 +112,30 @@ function sleepFun(logStr) {
   })
 }
 
-const getTaskList = async () => {
+// const getTaskList = async () => {
 
-  for (let i = 0; i < 30; i++) {
-    const token = sessionStorage.getItem('token')
-    // const token = getToken()
-    if (token && token.length > 0) {
-      break
-    }
+//   for (let i = 0; i < 30; i++) {
+//     const token = sessionStorage.getItem('token')
+//     // const token = getToken()
+//     if (token && token.length > 0) {
+//       break
+//     }
 
-    if (i === 29) {
-      return
-    }
-    await sleepFun(i + 1)
-  }
+//     if (i === 29) {
+//       return
+//     }
+//     await sleepFun(i + 1)
+//   }
 
 
-  const res = await postTaskList(queryParams)
-  if (res && res.code === 0) {
-    const {list, total} = res.data
-    taskList.list = list
-    totalNum.value = total
-    queryParams.pageIndex = 1
-    // getTaskList()
-  }
-}
+//   const res = await postTaskList(queryParams)
+//   if (res && res.code === 0) {
+//     const {list, total} = res.data
+//     taskList.list = list
+//     totalNum.value = total
+//     queryParams.pageIndex = 1
+//   }
+// }
 // 获取任务详情
 const getTaskDetail = (item) => {
   emit('getTaskDetail', {id: item.id})
@@ -217,11 +219,13 @@ const onOpertion = (typeName) => {
 }
 const handleSizeChange = (pageNum) => {
   queryParams.pageIndex = pageNum
-  getTaskList()
+  // getTaskList()
+  emit('getTaskList', pageNum)
 }
 const handleCurrentChange = (pageNum) => {
   queryParams.pageIndex = pageNum
-  getTaskList()
+  // getTaskList()
+  emit('getTaskList', pageNum)
 }
 watch(props.taskDetail, (n, o) => {
   // resultData = n.task
@@ -233,23 +237,24 @@ onMounted(() => {
     // console.log(resultData)
     // console.log(val, resultData)
     queryParams.pageIndex = 1
-    getTaskList()
+    emit('getTaskList', queryParams.pageIndex)
   })
   if (JSON.stringify(props.taskDetail.task) != '{}') {
     // isShowResult.value = true
     queryParams.pageIndex = 1
-    getTaskList()
+    // getTaskList()
+    emit('getTaskList', queryParams.pageIndex)
     resultData = props.taskDetail.task
   }
   // const token = getToken()
-  const token = sessionStorage.getItem('token')
-  if (token) {
-    getTaskList()
-  } else {
-    setTimeout(() => {
-      getTaskList()
-    }, 1500)
-  }
+  // const token = sessionStorage.getItem('token')
+  // if (token) {
+  //   getTaskList()
+  // } else {
+  //   setTimeout(() => {
+  //     getTaskList()
+  //   }, 1500)
+  // }
 })
 
 </script>

+ 31 - 2
src/views/HomeView.vue

@@ -21,7 +21,13 @@
           <StyleSetting :task-detail="taskDetail"/>
         </div>
         <div class="right-content flex1">
-          <ResultPage :task-detail="taskDetail" @getTaskDetail="getTaskDetail"/>
+          <ResultPage
+            :task-detail="taskDetail"
+            :task-list="taskList"
+            :total-num="totalNum"
+            @getTaskList="(page) => getList(page)"
+            @getTaskDetail="getTaskDetail"
+          />
         </div>
       </div>
       <div v-if="pageType == 'viewImgList'" class="content-page flex felx1">
@@ -37,7 +43,7 @@ import {useRoute} from 'vue-router'
 import StyleSetting from '@/components/StyleSetting'
 import ResultPage from '@/components/ResultPage'
 import TaskList from '@/components/TaskList'
-import {postTaskDetail, postLogin} from '@/network/api/user'
+import {postTaskDetail, postLogin, postTaskList} from '@/network/api/user'
 // import {setToken, getToken, removeToken} from '@/utils/auth'
 import emitter from '@/utils/bus'
 
@@ -58,6 +64,28 @@ const getTaskDetail = async (id) => {
     taskDetail.task = res.data
   }
 }
+// 获取历史数据
+let queryParams = reactive({
+  pageIndex: 1,
+  pageSize: 6
+})
+let taskList = reactive({
+  list: []
+})
+let totalNum = ref(0)
+const getList = async (page) => {
+  if (!page) {
+    page = 1
+  }
+  queryParams.pageIndex = page
+  const res = await postTaskList(queryParams)
+  if (res && res.code === 0) {
+    const {list, total} = res.data
+    taskList.list = list
+    totalNum.value = total
+    // queryParams.pageIndex = 1
+  }
+}
 // 登录
 const loadingIcon = '<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="#999" d="M512 64a32 32 0 0 1 32 32v192a32 32 0 0 1-64 0V96a32 32 0 0 1 32-32zm0 640a32 32 0 0 1 32 32v192a32 32 0 1 1-64 0V736a32 32 0 0 1 32-32zm448-192a32 32 0 0 1-32 32H736a32 32 0 1 1 0-64h192a32 32 0 0 1 32 32zm-640 0a32 32 0 0 1-32 32H96a32 32 0 0 1 0-64h192a32 32 0 0 1 32 32zM195.2 195.2a32 32 0 0 1 45.248 0L376.32 331.008a32 32 0 0 1-45.248 45.248L195.2 240.448a32 32 0 0 1 0-45.248zm452.544 452.544a32 32 0 0 1 45.248 0L828.8 783.552a32 32 0 0 1-45.248 45.248L647.744 692.992a32 32 0 0 1 0-45.248zM828.8 195.264a32 32 0 0 1 0 45.184L692.992 376.32a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0zm-452.544 452.48a32 32 0 0 1 0 45.248L240.448 828.8a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0z"></path></svg>'
 let loginLoading = ref(true)
@@ -72,6 +100,7 @@ const login = async () => {
       sessionStorage.setItem('token', res.data.token)
       // setToken(res.data.token)
       loginLoading.value = false
+      getList()
     } else {
       // removeToken()
       loginLoading.value = false