刘洋 2 سال پیش
والد
کامیت
00118885c3
3فایلهای تغییر یافته به همراه16 افزوده شده و 11 حذف شده
  1. 2 2
      server.config.ts
  2. 1 1
      src/modules/admin-subject/struct/index.vue
  3. 13 8
      src/modules/monitor/training-monitoring/index.vue

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

+ 1 - 1
src/modules/admin-subject/struct/index.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="flex-1 p-base">
       <el-card shadow="never">
-        <base-table size="small" :data="tableData" :columns="columns">
+        <base-table size="small" border stripe :data="tableData" :columns="columns">
           <template #column-operation="{ row }">
             <el-button type="primary" link @click="onEditSubQuestion(row)">编辑</el-button>
             <el-popconfirm :width="useVW(220)" hide-icon :title="`确认删除题目?`" @confirm="onDelete(row)">

+ 13 - 8
src/modules/monitor/training-monitoring/index.vue

@@ -40,6 +40,7 @@
           <!-- <el-button size="small" type="primary" custom-1 @click="viewPaper(false)">查看试卷</el-button> -->
         </div>
         <base-table
+          :max-height="tableMaxHeight"
           border
           stripe
           size="small"
@@ -56,7 +57,7 @@
 
 <script setup lang="tsx" name="TrainingMonitoring">
 /** 培训监控 */
-import { computed, onBeforeUnmount } from 'vue'
+import { computed, onBeforeUnmount, onBeforeMount, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElButton, ElMessage } from 'element-plus'
 import { minus, isDefine } from '@/utils/common'
@@ -71,7 +72,10 @@ import type { ExtractApiResponse } from '@/api/api'
 import type { EpTableColumn } from 'global-type'
 
 type TableDataType = ExtractArrayValue<ExtractApiResponse<'getTrainingMonitor'>['data']>
-
+const tableMaxHeight = ref(300)
+onBeforeMount(() => {
+  tableMaxHeight.value = window.innerHeight - 300
+})
 const { push } = useRouter()
 
 const { diffShow, model, items, rules, formRef, elFormRef, onOptionInit } = useFormFilter()
@@ -106,13 +110,14 @@ const columns = computed<EpTableColumn<TableDataType>[]>(() => {
       selectable(row) {
         return !!row.markerId
       },
+      fixed: 'left',
     },
-    { label: '评卷员', prop: 'markerName' },
-    { label: '状态', prop: 'status' },
-    { label: '平均分', prop: 'avg' },
-    { label: '标准差', prop: 'std' },
-    { label: '相关系数', prop: 'xyRelate' },
-    { label: '差异份数', prop: 'diffCount' },
+    { label: '评卷员', prop: 'markerName', width: 100, fixed: 'left' },
+    { label: '状态', prop: 'status', width: 100, fixed: 'left' },
+    { label: '平均分', prop: 'avg', width: 80 },
+    { label: '标准差', prop: 'std', width: 80 },
+    { label: '相关系数', prop: 'xyRelate', width: 80 },
+    { label: '差异份数', prop: 'diffCount', width: 80 },
     ...cols,
   ]
 })