bug fix

src/api/api-types/statistics.d.ts

@@ -221,8 +221,7 @@ export namespace Statistics {
     secretNumber: string
     taskId: number
   }
-  // type UnMarkPaperList = BaseDefine<MultipleQuery<BaseParams>, MultipleResult<UnMarkPaper>>
-  type UnMarkPaperList = BaseDefine<BaseParams, MultipleResult<UnMarkPaper>>
+  type UnMarkPaperList = BaseDefine<MultipleQuery<BaseParams>, MultipleResult<UnMarkPaper>>
   /** 质量统计-收尾检查-未处理雷同卷列表 */
   interface UnProcessSimilar {
     questionMainName: string

src/components/shared/MarkHistoryList.vue

@@ -4,7 +4,7 @@
     :modal="false"
     draggable
     class="mark-history-list"
-    :title="`给分记录（ ${task.secretNumber} ）`"
+    :title="`给分记录（ ${number ? number : task.secretNumber} ）`"
     width="600px"
   >
     <template #default>
@@ -42,6 +42,7 @@ const props = withDefaults(
     showLevel?: boolean
     task: any
     height?: string
+    number?: number | null
   }>(),
   {
     modelValue: true,
@@ -49,6 +50,7 @@ const props = withDefaults(
     showLevel: false,
     task: {},
     height: '',
+    number: 0,
   }
 )
 

src/layout/main/MenuItem.vue

@@ -98,7 +98,6 @@ const props = defineProps<{
   menu: ExtractArrayValue<typeof mainLayoutStore.menuList>
 }>()
 const mClick = (info: any) => {
-  console.log('iii', info)
   if (
     info.label === '评阅试卷' &&
     info.path === '/marking' &&

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

@@ -38,6 +38,7 @@
     :id="currentViewHistory?.taskId"
     v-model="visibleHistory"
     :task="currentViewHistory"
+    :number="current?.number"
   ></mark-history-list>
 </template>
 

src/modules/monitor/training-monitoring/index.vue

@@ -41,6 +41,7 @@
           <!-- <el-button size="small" type="primary" custom-1 @click="viewPaper(false)">查看试卷</el-button> -->
         </div>
         <base-table
+          :key="refreshKey"
           :max-height="tableMaxHeight"
           border
           stripe
@@ -100,6 +101,7 @@ const rowClassName = (obj: any) => {
     return 'fixed-row'
   }
 }
+const refreshKey = ref(Date.now() + '')
 const columns = computed<EpTableColumn<TableDataType>[]>(() => {
   const standardScores = trainingMonitor?.value?.data?.[0]?.scoreList
   const cols: EpTableColumn<TableDataType>[] =
@@ -189,6 +191,7 @@ async function onSearch() {
       getTrainingMonitor(params).then(() => {
         currentDataType = dataType
         curForceGroupNumber = fGroupNumber
+        refreshKey.value = Date.now() + ''
       })
     }
   } catch (error) {

src/modules/quality/ending-check/components/EndCheck.vue

@@ -248,7 +248,13 @@ const items = computed<EpFormItem[]>(() => [
 /** 未评卷 table */
 const columns1: EpTableColumn[] = [
   { type: 'selection', width: 55 },
-  { label: '评卷员', prop: 'markerName' },
+  {
+    label: '评卷员',
+    prop: 'markerName',
+    formatter(row) {
+      return `${row.loginName}-${row.markerName}`
+    },
+  },
   { label: '密号', prop: 'secretNumber' },
   { label: '大题', prop: 'questionMainName' },
 ]
@@ -267,9 +273,9 @@ const columns3: EpTableColumn[] = [
 /** 开始检查 */
 const onStartCheck = () => {
   // getUnMarkPaperList({ pageNumber: 1, pageSize: 20, ...model })
-  getUnMarkPaperList({ ...model })
+  getUnMarkPaperList({ pageNumber: 1, pageSize: 999999, ...model })
   // getUnMarkBackPaperList({ pageNumber: 1, pageSize: 20, ...model })
-  getUnMarkBackPaperList({ ...model })
+  getUnMarkBackPaperList({ pageNumber: 1, pageSize: 999999, ...model })
   getUnProcessProblemList(model)
   getUnProcessSimilarList(model)
 }
@@ -298,6 +304,10 @@ const onSubmitChangeMarker = async () => {
     // }
     const valid = await elFormRef?.value?.validate()
     if (valid) {
+      if (unMarkPaperList.value?.result.find((item: any) => item.loginName == changeMarkerModel.loginName)) {
+        return ElMessage.error('任务指定不可指定给原评卷人')
+      }
+
       await useFetch('changeTaskMarker').fetch({
         // taskId: currentTask.value.taskId,
         taskIds: multipleSelection1.value.map((item: any) => item.taskId),
@@ -317,6 +327,9 @@ const onSubmitChangeMarker2 = async () => {
     // }
     const valid = await elFormRef?.value?.validate()
     if (valid) {
+      if (unMarkBackPaperList.value?.result.find((item: any) => item.loginName == changeMarkerModel2.loginName)) {
+        return ElMessage.error('任务指定不可指定给原评卷人')
+      }
       await useFetch('changeBackTaskMarker').fetch({
         // taskId: currentTask2.value.taskId,
         taskIds: multipleSelection2.value.map((item: any) => item.taskId),