bug fix

src/modules/analysis/group-monitoring-detail/index.vue

@@ -147,6 +147,8 @@ const { pagination, currentPage, total, data, fetchTable } = useTable(
   {
     operateType: query.operateType as 'VIEW' | 'MARK',
     headerId: query.headerId as string,
+    subjectCode: query.subjectCode,
+    mainNumber: query.questionMainNumber,
   },
   { pageSize: 4 }
 )

src/modules/analysis/group-monitoring/index.vue

@@ -24,10 +24,13 @@ import BaseTable from '@/components/element/BaseTable.vue'
 import useFetch from '@/hooks/useFetch'
 import useVW from '@/hooks/useVW'
 import useFormFilter from './hooks/useFormFilter'
-
+import { reactive } from 'vue'
 import type { EpTableColumn } from 'global-type'
 import type { ExtractApiResponse } from '@/api/api'
-
+const jumpParams = reactive<any>({
+  subjectCode: '',
+  questionMainNumber: void 0,
+})
 const { push } = useRouter()
 
 const { model, formModel, items, onOptionInit } = useFormFilter()
@@ -76,7 +79,10 @@ const columns: EpTableColumn<ExtractArrayValue<ExtractApiResponse<'getGroupMonit
 
 /** 刷新按钮 */
 function onSearch() {
-  getGroupMonitor(formModel.value)
+  getGroupMonitor(formModel.value).then(() => {
+    jumpParams.subjectCode = formModel.value.subjectCode
+    jumpParams.questionMainNumber = formModel.value.questionMainNumber
+  })
 }
 
 /** 查看抽查详情 */
@@ -91,7 +97,8 @@ function viewMonitoringDetail(
       operateType,
       headerId: row.markingGroupLeaderId,
       source: '组长监控',
-      subjectCode: model.subjectCode,
+      subjectCode: jumpParams.subjectCode,
+      questionMainNumber: jumpParams.questionMainNumber,
     },
   })
 }

src/modules/analysis/marking-progress/components/TotalProgress.vue

@@ -85,6 +85,7 @@ const model = reactive<any>({
   subjectCode: dataModel.subject || '',
   //todo
   questionMainNumber: null,
+  // hasGroupLeaderScore: [],
 })
 watch(
   dataModel,
@@ -119,6 +120,17 @@ const items = computed<EpFormItem[]>(() => [
     rowKey: 'row-1',
     colProp: { span: 5 },
   },
+  // {
+  //   prop: 'hasGroupLeaderScore',
+  //   label: '',
+  //   slotType: 'checkbox',
+  //   labelWidth: '20px',
+  //   slot: {
+  //     options: [{ label: 'true', slotLabel: '包含组长给分' }],
+  //   },
+  //   rowKey: 'row-1',
+  //   colProp: { span: 3 },
+  // },
   {
     rowKey: 'row-1',
     slotName: 'button',