刘洋 2 жил өмнө
parent
commit
c3933a4955

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

+ 3 - 3
src/modules/analysis/marking-progress/components/GroupProgress.vue

@@ -94,7 +94,7 @@ const columns = computed<TableColumn[]>(() => {
         return index < result?.value?.length - 1 ? index + 1 : (void 0 as unknown as number)
       },
     },
-    { label: '评卷员', prop: 'markerName', align: 'center' },
+    { label: '评卷员', prop: 'markerName', align: 'center', minWidth: 120, fixed: 'left' },
     ...dateTimes.value.map((d) => {
       return {
         label: d,
@@ -102,11 +102,11 @@ const columns = computed<TableColumn[]>(() => {
         formatter(row) {
           return row.dayFinishCounts.find((v) => v.date === d)?.count ?? ''
         },
-        width: 300,
+        minWidth: 100,
         sortable: true,
       } as TableColumn
     }),
-    { label: '合计', prop: 'totalFinishCount', align: 'center', sortable: true },
+    { label: '合计', prop: 'totalFinishCount', align: 'center', minWidth: 100, sortable: true, fixed: 'right' },
   ]
 })
 </script>

+ 9 - 2
src/modules/marking/assess/index.vue

@@ -68,7 +68,11 @@
       </div>
       <template #footer>
         <div class="flex justify-center">
-          <confirm-button @confirm="onHandOutForceCheck" @cancel="forceCheckVisible = false"></confirm-button>
+          <confirm-button
+            :loading="loading"
+            @confirm="onHandOutForceCheck"
+            @cancel="forceCheckVisible = false"
+          ></confirm-button>
         </div>
       </template>
     </base-dialog>
@@ -232,7 +236,10 @@ const onHandOutForceCheck = async () => {
     if (!model.markerIds?.length) {
       return ElMessage.error('请选择评卷员')
     }
-    handOutForceCheck(model)
+    await handOutForceCheck(model)
+    forceCheckVisible.value = false
+    treeRef?.value?.setCheckedKeys([])
+    ElMessage.success('操作成功')
   } catch (error) {
     console.error(error)
   }