Browse Source

feat: 考生数据导入增加每包打包人数

chenhao 2 years ago
parent
commit
e764cae4d2
2 changed files with 19 additions and 10 deletions
  1. 1 0
      src/api/api-types/system.d.ts
  2. 18 10
      src/modules/admin-data/marking/index.vue

+ 1 - 0
src/api/api-types/system.d.ts

@@ -7,6 +7,7 @@ export namespace System {
     dayNumber?: number
     dayNumber?: number
     file?: File
     file?: File
     mainNumber?: number
     mainNumber?: number
+    packageTaskCount?: number
     separator: string
     separator: string
     subjectCode: string
     subjectCode: string
   }
   }

+ 18 - 10
src/modules/admin-data/marking/index.vue

@@ -105,6 +105,7 @@ const model = reactive<ExtractApiParams<'importMarkingData'>>({
   subjectCode: dataModel.subject || '',
   subjectCode: dataModel.subject || '',
   separator: '',
   separator: '',
   mainNumber: dataModel.question,
   mainNumber: dataModel.question,
+  packageTaskCount: 5,
   dayNumber: void 0,
   dayNumber: void 0,
   file: void 0,
   file: void 0,
 })
 })
@@ -136,6 +137,7 @@ watch(
 const rules: EpFormRules = {
 const rules: EpFormRules = {
   subjectCode: [{ required: true, message: '请选择科目' }],
   subjectCode: [{ required: true, message: '请选择科目' }],
   mainNumber: [{ required: true, message: '请选择大题' }],
   mainNumber: [{ required: true, message: '请选择大题' }],
+  packageTaskCount: [{ required: true, message: '请设置每包打包人数' }],
   dayNumber: [{ required: true, message: '请设置计划评卷天数' }],
   dayNumber: [{ required: true, message: '请设置计划评卷天数' }],
   separator: [{ required: true, message: '请设置分隔符' }],
   separator: [{ required: true, message: '请设置分隔符' }],
   file: [{ required: true, message: '请选择导入文件' }],
   file: [{ required: true, message: '请选择导入文件' }],
@@ -147,53 +149,59 @@ const groups: FormGroup[] = [
   { groupTitle: '选择文件', rowKeys: ['row-5'] },
   { groupTitle: '选择文件', rowKeys: ['row-5'] },
 ]
 ]
 
 
-const span8 = defineColumn(_, '', { span: 8 })
+const span7 = defineColumn(_, '', { span: 7 })
 
 
 const items = computed<EpFormItem[]>(() => {
 const items = computed<EpFormItem[]>(() => {
   return [
   return [
-    span8({
+    span7({
       rowKey: 'row-1',
       rowKey: 'row-1',
       label: '科目',
       label: '科目',
       prop: 'subjectCode',
       prop: 'subjectCode',
       slotType: 'select',
       slotType: 'select',
       slot: { placeholder: '选择科目', options: subjectList.value, onChange: changeModelValue('subject') },
       slot: { placeholder: '选择科目', options: subjectList.value, onChange: changeModelValue('subject') },
     }),
     }),
-    span8({
+    span7({
       rowKey: 'row-1',
       rowKey: 'row-1',
       label: '大题',
       label: '大题',
-      labelWidth: useVW(90),
       prop: 'mainNumber',
       prop: 'mainNumber',
       slotType: 'select',
       slotType: 'select',
       slot: { placeholder: '选择大题', options: mainQuestionList.value, onChange: changeModelValue('question') },
       slot: { placeholder: '选择大题', options: mainQuestionList.value, onChange: changeModelValue('question') },
     }),
     }),
-    span8({
+    span7({
       rowKey: 'row-2',
       rowKey: 'row-2',
       label: '分隔符',
       label: '分隔符',
       prop: 'separator',
       prop: 'separator',
       slotType: 'input',
       slotType: 'input',
       slot: { placeholder: '分隔符' },
       slot: { placeholder: '分隔符' },
     }),
     }),
-    span8({
+    span7({
+      rowKey: 'row-3',
+      label: '每包打包人数',
+      prop: 'packageTaskCount',
+      slotType: 'inputNumber',
+      slot: { placeholder: '每包打包人数' },
+    }),
+    span7({
       rowKey: 'row-3',
       rowKey: 'row-3',
       label: '计划评卷天数',
       label: '计划评卷天数',
       prop: 'dayNumber',
       prop: 'dayNumber',
-      slotType: 'input',
+      slotType: 'inputNumber',
       slot: { placeholder: '计划评卷天数' },
       slot: { placeholder: '计划评卷天数' },
       itemDescription: { description: '系统将按各省考生平均分配到计划评卷天数中,确保各天的评卷进度一致' },
       itemDescription: { description: '系统将按各省考生平均分配到计划评卷天数中,确保各天的评卷进度一致' },
     }),
     }),
-    span8({
+    span7({
       rowKey: 'row-4',
       rowKey: 'row-4',
       label: '图片路径',
       label: '图片路径',
       slotName: 'address',
       slotName: 'address',
       itemDescription: { description: '试卷图片请按路径存放' },
       itemDescription: { description: '试卷图片请按路径存放' },
     }),
     }),
-    span8({
+    span7({
       rowKey: 'row-5',
       rowKey: 'row-5',
       label: '导入文件',
       label: '导入文件',
       prop: 'file',
       prop: 'file',
       slotName: 'import',
       slotName: 'import',
     }),
     }),
-    span8({
+    span7({
       rowKey: 'row-6',
       rowKey: 'row-6',
       slotName: 'progress',
       slotName: 'progress',
     }),
     }),