question接口新增subjectCode参数

server.config.ts

@@ -3,11 +3,11 @@ import type { ServerOptions } from 'vite'
 const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
-      target: 'http://192.168.10.41:8200',
+      // target: 'http://192.168.10.41:8200',
       // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.108:8200',
       // target: 'http://cet-test.markingtool.cn',
-      // target: 'http://192.168.10.136:80',
+      target: 'http://192.168.10.136:80',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

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

@@ -62,7 +62,7 @@ export namespace Question {
   }
   /** 获取大题评卷结构 */
   type GetQuestionStruct = BaseDefine<
-    { mainNumber?: number | string },
+    { mainNumber?: number | string; subjectCode?: any },
     { mainNumber: number | string; mainTitle: string; questionList: SubQuestionStruct[] }
   >
 

src/components/shared/ScoringPanel.vue

@@ -60,11 +60,21 @@ const props = withDefaults(
     score: (number | string)[]
     // mainNumber?: number | null
     mainNumber?: any
+    subjectCode?: any
     id?: number | null
     autoVisible?: boolean | undefined
     large?: boolean
   }>(),
-  { modal: false, toggleModal: true, score: () => [], mainNumber: null, id: null, autoVisible: true, large: true }
+  {
+    modal: false,
+    toggleModal: true,
+    score: () => [],
+    mainNumber: null,
+    subjectCode: null,
+    id: null,
+    autoVisible: true,
+    large: true,
+  }
 )
 
 const emits = defineEmits(['submit', 'update:score', 'update:visible', 'update:modal'])
@@ -125,7 +135,7 @@ watch(
     scoreValues.value = []
     if (props.mainNumber) {
       resetQuestionStruct()
-      getQuestionStruct({ mainNumber: props.mainNumber })
+      getQuestionStruct({ mainNumber: props.mainNumber, subjectCode: props.subjectCode })
     }
   },
   { immediate: true }

src/components/shared/ScoringPanelWithConfirm.vue

@@ -4,6 +4,7 @@
     v-model:score="modelScore"
     v-model:visible="modalVisible"
     :main-number="props.mainNumber"
+    :subject-code="props.subjectCode"
     :large="props.large ?? false"
     @submit="onSubmit"
   ></scoring-panel>
@@ -53,6 +54,7 @@ const props = defineProps<{
   score: number[]
   /** 大题号 */
   mainNumber?: number | string
+  subjectCode?: any
   large?: boolean
 }>()
 

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

@@ -68,6 +68,7 @@
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
           :main-number="current?.mainNumber"
+          :subject-code="query.subjectCode || ''"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>

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

@@ -87,6 +87,7 @@ function viewMonitoringDetail(
       operateType,
       headerId: row.markingGroupLeaderId,
       source: '小组长监控',
+      subjectCode: model.subjectCode,
     },
   })
 }

src/modules/analysis/statistics/index.vue

@@ -214,6 +214,7 @@ const viewMarkDetail = (row: ExtractArrayValue<ExtractRecordValue<ExtractApiResp
     query: {
       markerName: row.markerName,
       source: '统计',
+      subjectCode: model.subjectCode,
     },
   })
 }

src/modules/analysis/view-marked-detail/index.vue

@@ -41,6 +41,7 @@
           v-model:visible="editScoreVisible"
           v-model:score="modelScore"
           :main-number="current?.mainNumber"
+          :subject-code="query.subjectCode"
           modal
           :auto-visible="false"
           @submit="onSubmit"

src/modules/expert/assess/index.vue

@@ -35,6 +35,7 @@
           v-model:visible="editScoreVisible"
           v-model:score="modelScore"
           :main-number="currentAssessPaper?.mainNumber"
+          :subject-code="formModel.subjectCode"
           modal
           :auto-visible="false"
           @submit="onSubmit"

src/modules/expert/expert/index.vue

@@ -36,6 +36,7 @@
           modal
           :auto-visible="false"
           :main-number="currentExpertPaper?.mainNumber"
+          :subject-code="formModel.subjectCode"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>

src/modules/expert/sample/index.vue

@@ -36,6 +36,7 @@
           modal
           :auto-visible="false"
           :main-number="currentRfPaper?.mainNumber"
+          :subject-code="formModel.subjectCode"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>

src/modules/marking/arbitration/index.vue

@@ -23,6 +23,7 @@
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
           :main-number="currentArbitration?.mainNumber"
+          :subject-code="formModel.subjectCode"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>

src/modules/marking/inquiry-result/index.vue

@@ -41,6 +41,7 @@
           v-model:visible="editScoreVisible"
           v-model:score="modelScore"
           :main-number="current?.mainNumber"
+          :subject-code="query.subjectCode"
           modal
           :auto-visible="false"
           @submit="onSubmit"

src/modules/marking/mark/index.vue

@@ -40,6 +40,7 @@
       v-model:visible="scoringPanelVisible"
       v-model:score="modelScore"
       :main-number="currentTask?.mainNumber"
+      :subject-code="mainStore.myUserInfo?.subjectCode"
       :large="true"
       @submit="onSubmit"
     ></scoring-panel-with-confirm>
@@ -93,6 +94,7 @@ import CurrentTime from '@/components/shared/CurrentTime.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 import bus from '@/utils/bus'
 import useMainLayoutStore from '@/store/layout'
+import useMainStore from '@/store/main'
 import MarkingStatus from '@/assets/images/status-marking.png'
 import ReMarkingStatus from '@/assets/images/status-remarking.png'
 import SampleAStatus from '@/assets/images/status-sample-a.png'
@@ -102,6 +104,7 @@ import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiResponse } from '@/api/api'
 import type { MarkHeaderInstance } from 'global-type'
 const mainLayoutStore = useMainLayoutStore()
+const mainStore = useMainStore()
 const { push, replace } = useRouter()
 const imgWrap = ref()
 const { getSpentTime, resume } = useSpentTime()

src/modules/marking/problem/index.vue

@@ -37,6 +37,7 @@
             v-model:visible="scoringPanelVisible"
             v-model:score="modelScore"
             :main-number="currentProblem?.mainNumber"
+            :subject-code="formModel.subjectCode"
             @submit="onSubmit"
           ></scoring-panel-with-confirm>
         </div>

src/modules/marking/repeat/index.vue

@@ -33,6 +33,7 @@
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
           :main-number="currentReMarkPaper?.mainNumber"
+          :subject-code="formModel.subjectCode"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>

src/modules/monitor/system-check/index.vue

@@ -43,6 +43,7 @@
           modal
           :auto-visible="false"
           :main-number="currentSystemCheckPaper?.mainNumber"
+          :subject-code="formModel.subjectCode"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>

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

@@ -36,6 +36,7 @@
           v-model:visible="editScoreVisible"
           v-model:score="modelScore"
           :main-number="current?.mainNumber"
+          :subject-code="query.subjectCode"
           modal
           :auto-visible="false"
           @submit="onSubmit"

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

@@ -36,6 +36,7 @@
           v-model:visible="editScoreVisible"
           v-model:score="modelScore"
           :main-number="currentSubjectiveCheck?.mainNumber"
+          :subject-code="formModel.subjectCode"
           modal
           :auto-visible="false"
           @submit="onSubmit"