Merge pull request 'fix/updatesyspic' (#311) from fix/updatesyspic into test

Reviewed-on: #311

src/api/home/main.ts

@@ -1,10 +1,14 @@
+import { pickBy } from 'lodash-es'
+import axios from 'axios'
 import { ContentTypeEnum } from '@/enums/httpEnum'
 import { notEmpty } from '@/utils'
 import { formatToDate2 } from '@/utils/dateUtil'
 import { http } from '@/utils/http/axios'
-import { pickBy } from 'lodash-es'
 import type { CheckParam, PageParam, QueryPictureParam, UploadParam } from '/#/api'
 
+const CancelToken = axios.CancelToken
+window.cancle = {}
+
 /**
  * 头部信息
  * @returns
@@ -224,6 +228,9 @@ export async function queryPageListByCheckNo(params: any): Promise<any> {
     method: 'get',
     params: notEmptyParams,
     headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
+    cancelToken: new CancelToken((c) => {
+      window.cancle.queryPageListByCheckNo = c
+    }),
   })
 
   const { data: { records, pages, total, current } } = res
@@ -260,6 +267,9 @@ export async function getPictureList(params: any): Promise<any> {
     method: 'get',
     params: notEmptyParams,
     headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
+    cancelToken: new CancelToken((c) => {
+      window.cancle.getPictureList = c
+    }),
   })
 
   const { data: { records, pages, total, current } } = res

src/views/home/content/Content.vue

@@ -299,8 +299,12 @@ async function featchList(userSearchId?: string) {
       params.izsimilarity = params.izsimilarity.join('-')
 
     // rao end
-
+    console.log('window.cancle.queryPageListByCheckNo', window.cancle.queryPageListByCheckNo)
+    console.log('window.cancle.getPictureList', window.cancle.getPictureList)
     if (checkTaskStatus.value === 2 && isRefresh) {
+      // 取消上次的请求
+      window.cancle.queryPageListByCheckNo && window.cancle.queryPageListByCheckNo()
+      window.cancle.getPictureList && window.cancle.getPictureList()
       result = await queryPageListByCheckNo({
         ...pagination,
         ...contentParams,
@@ -311,6 +315,9 @@ async function featchList(userSearchId?: string) {
       })
     }
     else {
+      // 取消上次的请求
+      window.cancle.queryPageListByCheckNo && window.cancle.queryPageListByCheckNo()
+      window.cancle.getPictureList && window.cancle.getPictureList()
       result = await getPictureList({
         ...pagination,
         ...contentParams,