Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop

src/components/DataTable/tools/useDataSource.js

 
 export function useDataSource(propsRef, { getPaginationInfo, setPagination, setLoading, tableData }, emit) {
   const dataSourceRef = ref([])
-
+  const paginationPage = ref(1)
   async function fetch(opt) {
     try {
       /* 设置loading */
         pageParams = {}
       } else {
         pageParams[pageField] = (opt && opt[pageField]) || page
+        paginationPage.value = pageParams[pageField]
         pageParams[sizeField] = pageSize
       }
       const params = {
     await fetch(opt)
   }
 
-  async function reFetch(opt) {
+  async function reFetch(opt, reload = true) {
     const { paginationSetting } = unref(propsRef)
     const pageField = paginationSetting.pageField
     const sizeField = paginationSetting.sizeField
     const pageSize = paginationSetting.pageSize
     setPagination({
-      [pageField]: 1,
+      [pageField]: reload ? 1 : paginationPage.value,
       [sizeField]: pageSize
     })
     await fetch(opt)

src/views/task-manage/all-task/components/DemandDrawer.vue

         analyseRef.value?.disposeVideo()
         data.videoInfo.origin.status = 'init'
         data.videoInfo.analyse.status = 'init'
+        data.videoShow = 'back'
         data.mapData = null
       }
     }, { deep: true })

src/views/task-manage/question/index.vue

     </template>
   </DataTable>
 
-  <ConfirmModal v-if="confirmModal" v-model:visible="confirmModal" :data="pageData" :select-row="rowData" @update-data="handleSearch" />
+  <ConfirmModal v-if="confirmModal" v-model:visible="confirmModal" :data="pageData" :select-row="rowData" @update-data="handleReload" />
 
   <!-- 图片位置 -->
   <position-drawer v-model:visible="positionDrawer" :data="rowData" />
         missionId: props.data.id,
         ...res
       }
-      if (_params.status === 'all') _params.status = ''
+      if (_params.type === 'all') _params.type = null
       return await getQuestionList(_params)
     }
 
       }
     }
 
+    function handleReload() {
+      data.handleSearch(data.searchParams, false)
+    }
     return {
       ...toRefs(data),
       loadDataTable,
       handleRowsCheck,
       handleIgnoreBatch,
       handleConfirmBatch,
-      handleReported
+      handleReported,
+      handleReload
 
     }
   }

src/views/task-manage/question/tools/search.js

 
 const data = reactive([
   {
-    label: '任务状态',
-    key: 'status',
+    label: '问题类型',
+    key: 'type',
     type: 'select',
     value: 'all',
     props: {
-      placeholder: '请选择任务状态',
+      placeholder: '请选择问题类型',
       options: [
         { label: '全部', value: 'all' },
         ...QUESTION_TYPE

src/views/task-manage/question/tools/table.js

 const tableRef = ref()
 const searchParams = ref()
 
-function handleSearch(params) {
+function handleSearch(params, reload = true) {
   searchParams.value = { ...params }
-  tableRef.value.reFetch({ searchParams })
+  tableRef.value.reFetch({ searchParams }, reload)
 }
 
 /* 问题忽略 */
     .then(res => {
       if (res.code === 0) {
         data.selectRowKeys = []
-        handleSearch()
+        handleSearch(searchParams.value, false)
       }
     })
 }
     .then(res => {
       if (res.code === 0) {
         data.selectRowKeys = []
-        handleSearch()
+        handleSearch(searchParams.value, false)
       }
     })
 }