一些细节纠正

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/assets/styles/element/custom.scss

@@ -365,6 +365,6 @@ body {
     }
   }
 }
-.mark-container .mark-content .mark-content-paper img{
-  max-width: none !important;
-}
+// .mark-container .mark-content .mark-content-paper img{
+//   max-width: none !important;
+// }

src/components/shared/message/MessageSend.vue

@@ -259,10 +259,10 @@ watch(messageContent, (val: string) => {
   config.other = val || ''
   setUserConfigByType('draft', config)
 })
-onMounted(() => {
-  const draft = getUserConfigByType('draft')?.other
-  draft && (messageContent.value = draft)
-})
+// onMounted(() => {
+//   const draft = getUserConfigByType('draft')?.other
+//   draft && (messageContent.value = draft)
+// })
 const onContentClick = (e: Event) => {
   const target = e.target as HTMLButtonElement
   const path = target.getAttribute('data-path')

src/hooks/useSetImgBg.ts

@@ -194,7 +194,6 @@ export const useSetImgBg = (option: Ref<SetImgBgOption>, frontColor?: Ref<string
   const imgLoading = ref(false)
   imageWorker.addEventListener('message', (e) => {
     const data = e.data as MessageData
-    console.log('data.drawing', data.drawing)
     if (!data.drawing) {
       drawing.value = data.drawing
       dataUrl.value = data.blob ? URL.createObjectURL(data.blob) : ''

src/modules/analysis/marker-statistics/index.vue

@@ -203,7 +203,7 @@ const onSendBack = () => {
 const onRejected = () => {
   // onRefresh()
   ElMessage.success('打回成功')
-  fetchTable()
+  // fetchTable()
 }
 /** 给分板 */
 const editScoreVisible = ref<boolean>(true)

src/modules/analysis/personnel-statistics/components/StatisticsPersonnel.vue

@@ -87,7 +87,7 @@
 /** 人员数据统计-按人员展开 */
 import { ref, inject, computed, watch, nextTick, unref } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import { ElButton, ElPopover, ElMenu, ElMenuItem } from 'element-plus'
+import { ElButton, ElPopover, ElMenu, ElMenuItem, ElIcon } from 'element-plus'
 import VueECharts from 'vue-echarts'
 import BaseTable from '@/components/element/BaseTable.vue'
 import SetWorkload from './SetWorkload.vue'
@@ -97,6 +97,7 @@ import useTableCheck from '@/hooks/useTableCheck'
 import RightKeyMenu from './RightKeyMenu.vue'
 import useMainStore from '@/store/main'
 import { cloneDeep } from 'lodash-es'
+import { Top, Bottom } from '@element-plus/icons-vue'
 import type { EChartsOption } from 'echarts'
 import type { ExtractApiResponse, ExtractApiParams } from '@/api/api'
 import type { EpTableColumn } from 'global-type'
@@ -156,7 +157,35 @@ const columns = computed(() => {
     { label: '评卷员', prop: 'markerName', minWidth: 100, slotName: 'marker', fixed: 'left' },
 
     { align: 'center', label: '份数', prop: 'markingPaperCount', minWidth: 80 },
-    { align: 'center', label: '平均分', prop: 'avg', minWidth: 64 },
+    {
+      align: 'center',
+      label: '平均分',
+      prop: 'avg',
+      minWidth: 64,
+      formatter(row: any) {
+        let lastAvg = row.lastAvg
+        let avg = row.avg
+        return avg > lastAvg && row.markerId ? (
+          <span>
+            {row.avg}
+
+            <ElIcon size={16} color="green" style="margin-left:1px;vertical-align:middle;margin-top:-2px">
+              <Top />
+            </ElIcon>
+          </span>
+        ) : avg < lastAvg && row.markerId ? (
+          <span>
+            {row.avg}
+
+            <ElIcon size={16} color="red" style="margin-left:1px;vertical-align:middle;margin-top:-2px">
+              <Bottom />
+            </ElIcon>
+          </span>
+        ) : (
+          <span>{row.avg}</span>
+        )
+      },
+    },
     {
       align: 'center',
       label: '相关系数',

src/modules/analysis/personnel-statistics/index.vue

@@ -184,7 +184,8 @@ const data = computed<ExtractApiResponse<'getStatisticsByGroup'>>(() => {
             )
           })
         }
-        return groupItem.markerDetails && groupItem.markerDetails.length ? groupItem : null
+        // return groupItem.markerDetails && groupItem.markerDetails.length ? groupItem : null
+        return groupItem
       }
     })
     .filter((v: any) => !!v)

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

@@ -182,7 +182,7 @@ const onSendBack = () => {
 const onRejected = () => {
   // onRefresh()
   ElMessage.success('打回成功')
-  fetchTable()
+  // fetchTable()
 }
 /** 给分板 */
 const editScoreVisible = ref<boolean>(true)

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

@@ -204,7 +204,7 @@ const onSendBack = () => {
 const onRejected = () => {
   // onRefresh()
   ElMessage.success('打回成功')
-  fetchTable()
+  // fetchTable()
 }
 
 /** 给分板 */

src/modules/quality/ending-check/components/SubjectProgress.vue

@@ -24,7 +24,7 @@
   </div>
 </template>
 
-<script setup lang="ts" name="SubjectProgress">
+<script setup lang="tsx" name="SubjectProgress">
 /** 科目进度 */
 import { reactive, ref, computed, watch } from 'vue'
 import { minus } from '@/utils/common'
@@ -36,12 +36,15 @@ import BaseForm from '@/components/element/BaseForm.vue'
 import useForm from '@/hooks/useForm'
 import useOptions from '@/hooks/useOptions'
 import { ElButton } from 'element-plus'
+import { useRouter } from 'vue-router'
 
 import type { EChartsOption } from 'echarts'
 import type { ExtractApiResponse } from '@/api/api'
 import type { EpTableColumn, InstanceTable } from 'global-type'
 
 type SubjectProgress = ExtractArrayValue<ExtractApiResponse<'subjectProgressEnd'>>
+
+const router = useRouter()
 const subjectView = ref<any>({
   code: '',
   name: '',
@@ -243,7 +246,9 @@ const totalChartsOption = computed<EChartsOption>(() => {
     ],
   }
 })
-
+const toOtherPage = (name: string) => {
+  router.push({ name })
+}
 const columns: EpTableColumn<SubjectProgress>[] = [
   {
     label: '科目',
@@ -282,9 +287,48 @@ const columns: EpTableColumn<SubjectProgress>[] = [
       return `${minus(100, row.finishRate)}%`
     },
   },
-  { label: '问题卷待处理', prop: 'todoProblemPaperCount', minWidth: 110 },
-  { label: '雷同卷待处理', prop: 'todoSamePaperCount', minWidth: 110 },
-  { label: '主观题校验待处理', prop: 'subjectiveUnVerifyPaperCount', minWidth: 140 },
+  {
+    label: '问题卷待处理',
+    prop: 'todoProblemPaperCount',
+    minWidth: 110,
+    formatter(row: any) {
+      return row.questionMainNumber == 0 ? (
+        <span>{row.todoProblemPaperCount}</span>
+      ) : (
+        <ElButton type="primary" link onClick={() => toOtherPage('MarkingProblem')}>
+          {row.todoProblemPaperCount}
+        </ElButton>
+      )
+    },
+  },
+  {
+    label: '雷同卷待处理',
+    prop: 'todoSamePaperCount',
+    minWidth: 110,
+    formatter(row: any) {
+      return row.questionMainNumber == 0 ? (
+        <span>{row.todoSamePaperCount}</span>
+      ) : (
+        <ElButton type="primary" link onClick={() => toOtherPage('MarkingSimilar')}>
+          {row.todoSamePaperCount}
+        </ElButton>
+      )
+    },
+  },
+  {
+    label: '主观题校验待处理',
+    prop: 'subjectiveUnVerifyPaperCount',
+    minWidth: 140,
+    formatter(row: any) {
+      return row.questionMainNumber == 0 ? (
+        <span>{row.subjectiveUnVerifyPaperCount}</span>
+      ) : (
+        <ElButton type="primary" link onClick={() => toOtherPage('QualitySubjectiveCheck')}>
+          {row.subjectiveUnVerifyPaperCount}
+        </ElButton>
+      )
+    },
+  },
   {
     label: '抽查比例',
     prop: 'checkPaperRate',