bug fix

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/modules/analysis/marker-statistics/index.vue

@@ -417,6 +417,7 @@ const columns: EpTableColumn<any>[] = [
   { label: '给分', prop: 'markerScore', minWidth: 70 },
   { label: '客观分', prop: 'objectiveScore', minWidth: 70 },
   { label: '客主比', prop: 'markerRatio', minWidth: 80 },
+  { label: '成绩客主比', prop: 'ratio', minWidth: 110 },
   { label: '成绩', prop: 'markScore', minWidth: 70 },
 ]
 

src/modules/marking/mark/index.vue

@@ -344,6 +344,13 @@ const problemClass = ref<'problem' | 'similar'>('problem')
 // const problemType = ref<ProblemType>('OVERSTEP')
 const problemType = ref<any>('')
 const similarType = ref<any>('')
+watch(problemVisible, () => {
+  if (problemVisible.value) {
+    problemClass.value = 'problem'
+    problemType.value = ''
+    similarType.value = ''
+  }
+})
 /** 分数列表 */
 const modelScore = ref<number[]>([])
 const remarkBoxRef = ref()
@@ -428,7 +435,21 @@ const onSubmitProblem = async () => {
   // if (!bool) {
   //   return false
   // }
-  await getNextTask(true, submitResult?.refresh, !bool)
+  // await getNextTask(true, submitResult?.refresh, !bool)
+  if (remarkModalVisible.value) {
+    let nextHistoryTask = remarkBoxRef.value?.getNextRow()
+    if (nextHistoryTask) {
+      historyTaskChange(nextHistoryTask)
+    } else {
+      if (nextHistoryTask === false) {
+        //说明回评列表是空的，当前依然处于正评，走正常的正评逻辑，且关闭回评列表
+        remarkModalVisible.value = false
+        await getNextTask(true, submitResult?.refresh, !bool)
+      }
+    }
+  } else {
+    await getNextTask(true, submitResult?.refresh, !bool)
+  }
 }
 
 /** 提交问题卷 & 雷同卷 */