刘洋 2 éve
szülő
commit
480d3e96b8

+ 12 - 7
src/hooks/useTableCheck.ts

@@ -32,20 +32,23 @@ const useTableCheck = <T extends TableDataType<InputDataType>>(data: T, auto = t
 
   const tableData = computed(() => {
     const d = unref(data)
-    let result: RowType<T>[] = []
+    // let result: RowType<T>[] = []
+    let result: any[] = []
     if (d) {
       if (isMultipleData(d)) {
-        result = d?.result?.map((d, index) => ({ ...d, index: d.index ?? index })) as RowType<T>[]
+        result = d?.result?.map((d, index) => ({ ...d, index: d.index ?? index }))
       } else {
-        result = d?.map((d, index) => ({ ...d, index: d.index ?? index })) as RowType<T>[]
+        result = d?.map((d, index) => ({ ...d, index: d.index ?? index }))
       }
     }
     return result
   })
 
-  const current = ref<RowType<T>>()
+  // const current = ref<RowType<T>>()
+  const current = ref<any>()
 
-  const currentView = ref<RowType<T>>()
+  // const currentView = ref<RowType<T>>()
+  const currentView = ref<any>()
 
   const visibleHistory = ref<boolean>(false)
 
@@ -64,12 +67,14 @@ const useTableCheck = <T extends TableDataType<InputDataType>>(data: T, auto = t
   )
 
   /** 表格选中 */
-  const onCurrentChange = (row: RowType<T>) => {
+  // const onCurrentChange = (row: RowType<T>) => {
+  const onCurrentChange = (row: any) => {
     current.value = row
   }
 
   /** 表格行双击 */
-  const onDbClick = (row: RowType<T>) => {
+  // const onDbClick = (row: RowType<T>) => {
+  const onDbClick = (row: any) => {
     currentView.value = row
     visibleHistory.value = true
   }

+ 1 - 0
src/modules/marking/mark/index.vue

@@ -208,6 +208,7 @@ const refreshTaskPool = (force = false, isRefresh = false) => {
                 currentTaskPool = currentTaskPool.filter((item: any) => {
                   return item.type === 'FORCE' || !!item.markerId
                 })
+                currentTaskPool.unshift(...result)
               } else {
                 currentTaskPool.push(...result)
               }

+ 1 - 1
src/modules/marking/training-record/index.vue

@@ -107,7 +107,7 @@ const taskTypeMap: Record<string, string> = {
 
 const columns: EpTableColumn<RowType>[] = [
   // { label: '密号', prop: 'secretNumber' },
-  { label: '序号', type: 'index', minWidth: 40 },
+  { label: '序号', minWidth: 40, prop: 'number' },
   { label: '分数', prop: 'markScore' },
   { label: '标准分', prop: 'score' },
   {

+ 1 - 1
src/modules/quality/self-check/index.vue

@@ -194,7 +194,7 @@ const onSelfCheckAnalysisDBClick = () => {
 }
 
 /** 试卷列表双击 */
-const onPaperDBClick = (row: ExtractArrayValue<typeof papers.value>) => {
+const onPaperDBClick = (row: any) => {
   push({
     name: 'QualitySelfCheckDetail',
     query: {