bug fix

server.config.ts

@@ -3,9 +3,9 @@ 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.107:8200',
-      // target: 'http://cet-test.markingtool.cn',
+      target: 'http://cet-test.markingtool.cn',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

src/modules/analysis/monitoring/index.vue

@@ -390,10 +390,10 @@ watch([interval, initFinish], () => {
     .el-table__body-wrapper {
       .el-table__body {
         .top-three-row {
-          // background: rgba(0, 186, 151, 0.09);
+          background: rgba(0, 186, 151, 0.1);
         }
         .last-three-row {
-          // background: rgba(255, 114, 59, 0.09);
+          background: rgba(255, 114, 59, 0.1);
         }
         .el-table__cell {
           padding: 5px 0;

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

@@ -66,7 +66,15 @@ const columns: EpTableColumn<ExtractArrayValue<ExtractApiResponse<'getStatistics
   { align: 'center', label: '客观题0分量', prop: 'objectiveZero', width: 120 },
   { align: 'center', label: '客观平均分', prop: 'objectiveAvg', width: 110 },
   { align: 'center', label: '客观标准差', prop: 'objectiveStd', width: 104 },
-  { align: 'center', label: '重评/待确认', prop: 'reMarkUnConfirmCount', width: 120 },
+  {
+    align: 'center',
+    label: '重评/待确认',
+    prop: 'reMarkUnConfirmCount',
+    width: 120,
+    formatter(row: any) {
+      return `${row.reMarkCount}/${row.reMarkUnConfirmCount}`
+    },
+  },
   { align: 'center', label: '抽查量', prop: 'checkCount', width: 90 },
   { align: 'center', label: '抽查改正量', prop: 'checkCorrectCount', width: 110 },
   { align: 'center', label: '相关系数', prop: 'xyRelate', width: 90 },

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

@@ -177,20 +177,37 @@ const onOperationClick: OperationClick = ({ type, value }) => {
 }
 
 const columns: EpTableColumn<RowType>[] = [
-  { label: '密号', prop: 'secretNumber' },
-  { label: '评卷员', prop: 'markerName' },
-  { label: '评卷员给分', prop: 'markerScore' },
-  { label: '组长给分', prop: 'headerScore' },
-  { label: '评卷时间', prop: 'markTime' },
+  { label: '密号', prop: 'secretNumber', width: 100, fixed: 'left' },
+  { label: '评卷员', prop: 'markerName', width: 90 },
+  { label: '评卷员给分', prop: 'markerScore', width: 88 },
+  { label: '组长给分', prop: 'headerScore', width: 70 },
+  { label: '评卷时间', prop: 'markTime', width: 152 },
   { label: '抽查次数', prop: 'customCheckNumber' },
 ]
 
+const transTime = (str: any) => {
+  if (str.indexOf('-') > -1) {
+    return str
+  } else {
+    return `${str.slice(0, 4)}-${str.slice(4, 6)}-${str.slice(6, 8)} ${str.slice(8, 10)}:${str.slice(
+      10,
+      12
+    )}:${str.slice(12, 14)}`
+  }
+}
+
 const transformQuery = (query: Record<string, string>) => {
   let params: Record<string, string> = {}
 
   for (let k in query) {
     params[k] = ['true', 'false'].includes(query[k]) ? new Function(`return ${query[k]}`)() : query[k]
   }
+  if (params.timeStart) {
+    params.timeStart = transTime(params.timeStart)
+  }
+  if (params.timeEnd) {
+    params.timeEnd = transTime(params.timeEnd)
+  }
   return params
 }
 

src/modules/marking/similar/index.vue

@@ -135,7 +135,8 @@ const columns: EpTableColumn<RowType>[] = [
     label: '雷同判定',
     prop: 'status',
     formatter(row) {
-      return { INITIAL: '', SAME: '雷同', NOT_SAME: '不雷同' }[row.status]
+      // return { INITIAL: '', SAME: '雷同', NOT_SAME: '不雷同' }[row.status]
+      return { INITIAL: '', SAME: '是', NOT_SAME: '否' }[row.status]
     },
   },
 ]

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

@@ -21,6 +21,16 @@
         <div class="flex-1 p-base scroll-auto mark-content-paper">
           <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
         </div>
+        <scoring-panel-with-confirm
+          :id="currentSubjectiveCheck?.taskId"
+          v-model:visible="editScoreVisible"
+          v-model:score="modelScore"
+          :main-number="currentSubjectiveCheck?.mainNumber"
+          modal
+          :toggle-modal="false"
+          :auto-visible="false"
+          @submit="onSubmit"
+        ></scoring-panel-with-confirm>
       </div>
       <div class="p-base radius-base fill-blank scroll-auto m-l-base table-view">
         <splitpanes class="default-theme" horizontal style="height: 100%">
@@ -72,16 +82,7 @@
       </div>
     </div>
   </div>
-  <scoring-panel-with-confirm
-    :id="currentSubjectiveCheck?.taskId"
-    v-model:visible="editScoreVisible"
-    v-model:score="modelScore"
-    :main-number="currentSubjectiveCheck?.mainNumber"
-    modal
-    :toggle-modal="false"
-    :auto-visible="false"
-    @submit="onSubmit"
-  ></scoring-panel-with-confirm>
+
   <image-preview v-model="previewModalVisible" :url="currentSubjectiveCheck?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
 </template>
@@ -286,8 +287,9 @@ const { fetch: subjectiveCheckMark } = useFetch('subjectiveCheckMark')
 const onSubmit = async () => {
   if (currentSubjectiveCheck.value) {
     await subjectiveCheckMark({ taskId: currentSubjectiveCheck.value.taskId, scores: modelScore.value })
-    currentSubjectiveCheck.value.markScore = add(...modelScore.value)
+    // currentSubjectiveCheck.value.markScore = add(...modelScore.value)
     ElMessage.success('修改成功')
+    onSearch()
   }
 }