feat: 字段调整

src/components/shared/MarkHistoryList.vue

@@ -2,7 +2,7 @@
   <scoring-panel-container v-model="visible" class="mark-history-list" title="给分记录">
     <template #default>
       <slot :data="tableData">
-        <base-table size="small" :data="tableData" :columns="columns"></base-table>
+        <base-table highlight-current-row size="small" :data="tableData" :columns="columns"></base-table>
       </slot>
     </template>
   </scoring-panel-container>

src/modules/bootstrap/login/index.vue

@@ -99,11 +99,15 @@ function loginSuccess(loginInfo: ExtractApiResponse<'userLogin'>) {
    * 否则大小组长进入监控首页, 评卷员进入评卷首页
    */
   if (loginInfo.role !== 'ADMIN') {
-    if (loginInfo.name) {
+    if (!loginInfo.needRealName) {
       mainStore.getMyUserInfo()
     }
     replace({
-      name: !loginInfo.name ? 'InitUserName' : loginInfo.role === 'MARKER' ? 'MarkingMark' : 'AnalysisMonitoring',
+      name: loginInfo.needRealName
+        ? 'InitUserName'
+        : loginInfo.role === 'MARKER'
+        ? 'MarkingMark'
+        : 'AnalysisMonitoring',
     })
   } else {
     replace({ name: 'CheckExam' })

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

@@ -169,7 +169,7 @@ const columns: EpTableColumn<RowType>[] = [
   { label: '密号', prop: 'secretNumber' },
   { label: '评卷员', prop: 'markerName' },
   { label: '评卷员给分', prop: 'markerScore' },
-  { label: '组长给分', prop: 'objectiveScore' },
+  { label: '组长给分', prop: 'headerScore' },
   { label: '评卷时间', prop: 'markTime' },
   { label: '抽查次数', prop: 'customCheckNumber' },
 ]

src/modules/marking/repeat/index.vue

@@ -38,6 +38,7 @@
           size="small"
           :data="tableData"
           :columns="columns"
+          highlight-current-row
           @current-change="onCurrentChange"
           @row-dblclick="onDbClick"
         ></base-table>
@@ -52,7 +53,6 @@
 /** 重评卷查看 */
 import { reactive, ref, computed, watch, nextTick } from 'vue'
 import { ElButton } from 'element-plus'
-import { add } from '@/utils/common'
 import { useSetImgBg } from '@/hooks/useSetImgBg'
 import useVW from '@/hooks/useVW'
 import useFetch from '@/hooks/useFetch'
@@ -209,12 +209,13 @@ const onSearch = async () => {
   getReMarkPaperList(formModel)
 }
 
-/** 重评卷打分 */
+/** 确认 */
 const { fetch: markReMarkPaper } = useFetch('markReMarkPaper')
 
-const onSubmit = () => {
+const onSubmit = async () => {
   if (currentReMarkPaper.value) {
-    markReMarkPaper({ id: currentReMarkPaper.value.id, scores: modelScore.value })
+    await markReMarkPaper({ id: currentReMarkPaper.value.id, scores: modelScore.value })
+    await onSearch()
   }
 }
 

types/api.d.ts

@@ -429,6 +429,7 @@ declare module 'api-type' {
       mainNumber: number
       markTime: string
       markerName: string
+      headerScore: number
       markerScore: number
       secretNumber: string
       taskId: number
@@ -1007,20 +1008,22 @@ declare module 'api-type' {
       identity: string
       secret: string
       sessionId: string
-      // 名称
+      /** 名称 */
       name: string
-      // 角色
+      /** 角色 */
       role: ROLE
-      // 用户ID
+      /** 用户ID */
       id: number
-      // 考试批次ID
+      /** 考试批次ID */
       examId: number
-      // 大题ID
+      /** 大题ID */
       mainNumber: number
-      // 评卷员状态
+      /** 评卷员状态 */
       stage: STAGE
-      // 科目代码
+      /** 科目代码 */
       subjectCode: string
+      /** needRealName */
+      needRealName: boolean
     }
     type UserLogin = BaseDefine<
       {