src/api/home/main.ts

@@ -1,14 +1,10 @@
-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
@@ -228,9 +224,6 @@ 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
@@ -267,9 +260,6 @@ 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,12 +299,8 @@ 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,
@@ -315,9 +311,6 @@ async function featchList(userSearchId?: string) {
       })
     }
     else {
-      // 取消上次的请求
-      window.cancle.queryPageListByCheckNo && window.cancle.queryPageListByCheckNo()
-      window.cancle.getPictureList && window.cancle.getPictureList()
       result = await getPictureList({
         ...pagination,
         ...contentParams,

src/views/home/content/modal/LoginSuccessModal.vue

@@ -59,7 +59,7 @@ defineExpose({
       <div class="wrapper-content">
         <div class="flex_box">
           <div class="item">
-              <img src="../../../../assets/images/task_count.png" width="48" height="48" />
+            <SvgIcon name="task_count" width="48" height="48" />
             <div class="num_box">
               {{ toolsData?.total || 0 }}
             </div>
@@ -68,7 +68,7 @@ defineExpose({
             </div>
           </div>
           <div class="item">
-            <img src="../../../../assets/images/task_wait.png" width="48" height="48" />
+            <SvgIcon name="task_wait" width="48" height="48" />
             <div class="num_box">
               {{ toolsData?.treat || 0 }}
             </div>
@@ -77,7 +77,7 @@ defineExpose({
             </div>
           </div>
           <div class="item">
-              <img src="../../../../assets/images/task_over.png" width="48" height="48" />
+            <SvgIcon name="task_over" width="48" height="48" />
             <div class="num_box">
               {{ toolsData?.approvedCount || 0 }}
             </div>
@@ -86,7 +86,7 @@ defineExpose({
             </div>
           </div>
           <div class="item">
-              <img src="../../../../assets/images/modal_reImg.png" width="48" height="48" />
+            <SvgIcon name="modal_reImg" width="48" height="48" />
             <div class="num_box">
               {{ toolsData?.repeat }}
             </div>

src/views/task/modal/MapModal.vue

@@ -78,12 +78,12 @@ defineExpose({
       background: #E8E8E8;
     height: 0.5px;
    width: 805px;
-    margin-left: -22px;
+    margin-left: -37px;
     top: 85px;
 }
 .close{
         position: absolute;
-    right: 23px;
+    right: 40px;
     font-size: 20px;
     cursor: pointer;
 }
@@ -278,8 +278,4 @@ height: 463px;
   background-color: #fff !important;
   border: 1px solid #cad2dd !important;
 }
-::v-deep( .n-card__content){
-  padding-left:  23px !important;
-   padding-right:  23px !important
-}
 </style>