刘洋 2 jaren geleden
bovenliggende
commit
b90120ad28
3 gewijzigde bestanden met toevoegingen van 9 en 7 verwijderingen
  1. 2 2
      server.config.ts
  2. 6 4
      src/modules/analysis/view-marked-detail/index.vue
  3. 1 1
      src/modules/marking/mark/index.vue

+ 2 - 2
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.107: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',
     },
   },

+ 6 - 4
src/modules/analysis/view-marked-detail/index.vue

@@ -62,9 +62,11 @@
             small
           ></el-pagination>
         </div>
-        <div class="flex-1 scroll-auto">
+        <div class="flex-1 scroll-auto m-t-mini">
           <base-table
             ref="tableRef"
+            border
+            stripe
             size="small"
             v-bind="pagination"
             height="100%"
@@ -178,12 +180,12 @@ const onOperationClick: OperationClick = ({ type, value }) => {
 }
 
 const columns: EpTableColumn<RowType>[] = [
-  { label: '评卷员', prop: 'markerName' },
-  { label: '密号', prop: 'secretNumber' },
+  { label: '评卷员', prop: 'markerName', width: 90 },
+  { label: '密号', prop: 'secretNumber', width: 100 },
   { label: '给分', prop: 'markerScore' },
   { label: '客观分', prop: 'objectiveScore' },
   { label: '客主比', prop: 'markerRatio' },
-  { label: '评卷时间', prop: 'markTime' },
+  { label: '评卷时间', prop: 'markTime', width: 150 },
 ]
 
 const { pagination, currentPage, data, fetchTable } = useTable('getPersonalMarkDetail', {

+ 1 - 1
src/modules/marking/mark/index.vue

@@ -165,7 +165,7 @@ const { fetch: getMarkStatus, result: markStatus } = useFetch('getMarkStatus')
 const historyTaskChange = (task: any) => {
   let saveTargetTask = unref(currentTask)
   console.log('saveTargetTask:', saveTargetTask)
-  if (currentTaskType.value != 'remarking') {
+  if (currentTaskType.value != 'remarking' && saveTargetTask) {
     currentTaskPool.unshift(saveTargetTask)
   }
   currentTask.value = task