feat: 培训监控强制考核组查询

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

@@ -24,10 +24,12 @@ import useVW from '@/hooks/useVW'
 import type { EpFormItem, EpTableColumn } from 'global-type'
 import type { ExtractApiParams, ExtractApiResponse } from '@/api/api'
 
+const { groupListWithAll, dataModel, changeModelValue, onOptionInit } = useOptions(['group'])
+
 const model = reactive<ExtractApiParams<'getMarkProgressByMarker'>>({
-  subjectCode: '',
-  questionMainNumber: void 0,
-  markingGroupNumbers: void 0,
+  subjectCode: dataModel.subject || '',
+  questionMainNumber: dataModel.question,
+  markingGroupNumbers: dataModel.group,
 })
 
 const { fetch, result } = useFetch('getMarkProgressByMarker')
@@ -42,17 +44,11 @@ const onExport = () => {
   exportStatistics(model)
 }
 
-const { groupListWithAll, dataModel, changeModelValue, onOptionInit } = useOptions(['group'])
-
-watch(
-  dataModel,
-  () => {
-    model.subjectCode = dataModel.subject || ''
-    model.questionMainNumber = dataModel.question
-    model.markingGroupNumbers = dataModel.group
-  },
-  { deep: true }
-)
+watch(dataModel, () => {
+  model.subjectCode = dataModel.subject || ''
+  model.questionMainNumber = dataModel.question
+  model.markingGroupNumbers = dataModel.group
+})
 
 onOptionInit(onSearch)
 

src/modules/expert/expert/index.vue

@@ -148,8 +148,10 @@ const onOperationClick: OperationClick = ({ type, value }) => {
   operationHandles[type]?.(value)
 }
 
+const { mainQuestionList, dataModel, changeModelValue, onOptionInit } = useOptions(['question'])
+
 const formModel = reactive<ExtractApiParams<'getExpertPickList'>>({
-  mainNumber: void 0,
+  mainNumber: dataModel.question,
   forceGroupNumber: void 0,
   role: 'CHIEF',
   paperType: 'RF',
@@ -166,8 +168,6 @@ watch(
   }
 )
 
-const { mainQuestionList, dataModel, changeModelValue, onOptionInit } = useOptions(['question'])
-
 watch(dataModel, () => {
   formModel.mainNumber = dataModel.question
 })

src/modules/marking/arbitration/index.vue

@@ -129,15 +129,15 @@ const onOperationClick: OperationClick = ({ type, value }) => {
   operationHandles[type]?.(value)
 }
 
+const { mainQuestionList, dataModel, changeModelValue, onOptionInit } = useOptions(['question'])
+
 const formModel = reactive<ExtractApiParams<'getArbitrationList'>>({
-  mainNumber: void 0,
+  mainNumber: dataModel.question,
   status: '',
   pageNumber: 1,
   pageSize: 9999999,
 })
 
-const { mainQuestionList, dataModel, changeModelValue, onOptionInit } = useOptions(['question'])
-
 watch(dataModel, () => {
   formModel.mainNumber = dataModel.question
 })

src/modules/monitor/training-monitoring/hooks/useFormFilter.ts

@@ -51,7 +51,7 @@ const useFormFilter = () => {
         getForceCheckGroupList({ subjectCode: model.subjectCode, mainNumber: model.mainNumber })
       }
     },
-    { deep: true }
+    { immediate: true }
   )
 
   watch(

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

@@ -54,19 +54,19 @@ import type { EpFormItem, EpTableColumn } from 'global-type'
 
 type FormModel = Omit<ExtractApiParams<'selfCheckAnalysis'>, 'startTime' | 'endTime'>
 
-const model = reactive<FormModel & { time: string }>({
-  time: '',
-  subjectCode: '',
-  questionMainNumber: void 0,
-  markingGroupNumber: void 0,
-})
-
 const { subjectList, mainQuestionList, groupListWithAll, dataModel, onOptionInit, changeModelValue } = useOptions([
   'subject',
   'question',
   'group',
 ])
 
+const model = reactive<FormModel & { time: string }>({
+  time: '',
+  subjectCode: dataModel.subject || '',
+  questionMainNumber: dataModel.question,
+  markingGroupNumber: dataModel.group,
+})
+
 watch(dataModel, () => {
   model.subjectCode = dataModel.subject || ''
   model.questionMainNumber = dataModel.question