feat: 表单样式调整

src/modules/admin-data/marking/index.vue

@@ -3,7 +3,7 @@
     <el-card shadow="never" class="form-card">
       <base-form
         ref="formRef"
-        :label-width="useVW(100)"
+        :label-width="useVW(120)"
         :disabled="loading"
         :groups="groups"
         :model="model"
@@ -121,32 +121,33 @@ const groups: FormGroup[] = [
   { groupTitle: '选择文件', rowKeys: ['row-5'] },
 ]
 
-const span6 = defineColumn(_, '', { span: 6 })
+const span8 = defineColumn(_, '', { span: 8 })
 
 const items = computed<EpFormItem[]>(() => {
   return [
-    span6({
+    span8({
       rowKey: 'row-1',
       label: '科目',
       prop: 'subjectCode',
       slotType: 'select',
       slot: { placeholder: '选择科目', options: subjectList.value, onChange: changeModelValue('subject') },
     }),
-    span6({
+    span8({
       rowKey: 'row-1',
       label: '大题',
+      labelWidth: useVW(90),
       prop: 'mainNumber',
       slotType: 'select',
       slot: { placeholder: '选择大题', options: mainQuestionList.value, onChange: changeModelValue('question') },
     }),
-    span6({
+    span8({
       rowKey: 'row-2',
       label: '分隔符',
       prop: 'separator',
       slotType: 'input',
       slot: { placeholder: '分隔符' },
     }),
-    span6({
+    span8({
       rowKey: 'row-3',
       label: '计划评卷天数',
       prop: 'dayNumber',
@@ -154,19 +155,19 @@ const items = computed<EpFormItem[]>(() => {
       slot: { placeholder: '计划评卷天数' },
       itemDescription: { description: '系统将按各省考生平均分配到计划评卷天数中，确保各天的评卷进度一致' },
     }),
-    span6({
+    span8({
       rowKey: 'row-4',
       label: '图片路径',
       slotName: 'address',
       itemDescription: { description: '试卷图片请按路径存放' },
     }),
-    span6({
+    span8({
       rowKey: 'row-5',
       label: '导入文件',
       prop: 'file',
       slotName: 'import',
     }),
-    span6({
+    span8({
       rowKey: 'row-6',
       slotName: 'progress',
     }),

src/modules/admin-data/paper/components/rf.vue

@@ -1,7 +1,7 @@
 <template>
   <base-form
     ref="formRef"
-    :label-width="useVW(88)"
+    :label-width="useVW(120)"
     :rules="rules"
     :groups="groups"
     :items="items"
@@ -9,8 +9,8 @@
     :disabled="loading"
   >
     <template #form-item-prefix>
-      <span class="flex items-center">
-        <el-input v-model="model.prefix"></el-input>
+      <span class="full-w flex items-center">
+        <el-input v-model="model.prefix" class="flex-1"></el-input>
         <span class="m-l-mini">0000000</span>
       </span>
     </template>
@@ -117,18 +117,18 @@ const groups: FormGroup[] = [
   { groupTitle: '选择文件', rowKeys: ['row-5'] },
 ]
 
-const span6 = defineColumn(_, '', { span: 6 })
+const span8 = defineColumn(_, '', { span: 8 })
 
 const items = computed<EpFormItem[]>(() => {
   return [
-    span6({
+    span8({
       rowKey: 'row-1',
       label: '科目',
       prop: 'subjectCode',
       slotType: 'select',
       slot: { placeholder: '选择科目', options: subjectList.value, onChange: changeModelValue('subject') },
     }),
-    span6({
+    span8({
       rowKey: 'row-1',
       label: '大题',
       labelWidth: useVW(100),
@@ -136,33 +136,33 @@ const items = computed<EpFormItem[]>(() => {
       slotType: 'select',
       slot: { placeholder: '选择大题', options: mainQuestionList.value, onChange: changeModelValue('question') },
     }),
-    span6({
+    span8({
       rowKey: 'row-2',
       label: '试卷密码前缀',
       prop: 'prefix',
       slotName: 'prefix',
       itemDescription: { description: '导用区别正常考生说试卷，导入卷密号为8位，如20000000' },
     }),
-    span6({
+    span8({
       rowKey: 'row-3',
       label: '分隔符',
       prop: 'separator',
       slotType: 'input',
       itemDescription: { description: '文件格式为:图象文件名|标准分数' },
     }),
-    span6({
+    span8({
       rowKey: 'row-4',
       label: '图片路径',
       slotName: 'address',
       itemDescription: { description: '试卷图片请按路径存放' },
     }),
-    span6({
+    span8({
       rowKey: 'row-5',
       label: '导入文件',
       prop: 'file',
       slotName: 'upload',
     }),
-    span6({
+    span8({
       rowKey: 'row-6',
       slotName: 'progress',
     }),

src/modules/admin-data/paper/components/sample.vue

@@ -1,7 +1,7 @@
 <template>
   <base-form
     ref="formRef"
-    :label-width="useVW(88)"
+    :label-width="useVW(120)"
     :groups="groups"
     :rules="rules"
     :items="items"
@@ -9,8 +9,8 @@
     :disabled="loading"
   >
     <template #form-item-prefix>
-      <span class="flex items-center">
-        <el-input v-model="model.prefix"></el-input>
+      <span class="full-w flex items-center">
+        <el-input v-model="model.prefix" class="flex-1"></el-input>
         <span class="m-l-mini">0000000</span>
       </span>
     </template>
@@ -120,18 +120,18 @@ const groups: FormGroup[] = [
   { groupTitle: '选择文件', rowKeys: ['row-6'] },
 ]
 
-const span6 = defineColumn(_, '', { span: 6 })
+const span8 = defineColumn(_, '', { span: 8 })
 
 const items = computed<EpFormItem[]>(() => {
   return [
-    span6({
+    span8({
       rowKey: 'row-1',
       label: '科目',
       prop: 'subjectCode',
       slotType: 'select',
       slot: { placeholder: '选择科目', options: subjectList.value, onChange: changeModelValue('subject') },
     }),
-    span6({
+    span8({
       rowKey: 'row-1',
       label: '大题',
       labelWidth: useVW(100),
@@ -139,7 +139,7 @@ const items = computed<EpFormItem[]>(() => {
       slotType: 'select',
       slot: { placeholder: '选择大题', options: mainQuestionList.value, onChange: changeModelValue('question') },
     }),
-    span6({
+    span8({
       rowKey: 'row-2',
       label: '分组代码',
       prop: 'paperType',
@@ -152,33 +152,33 @@ const items = computed<EpFormItem[]>(() => {
       },
       itemDescription: { description: 'Sample A/B卷' },
     }),
-    span6({
+    span8({
       rowKey: 'row-3',
       label: '试卷密码前缀',
       prop: 'prefix',
       slotName: 'prefix',
       itemDescription: { description: '导用区别正常考生说试卷，导入卷密号为8位，如10000000' },
     }),
-    span6({
+    span8({
       rowKey: 'row-4',
       label: '分隔符',
       prop: 'separator',
       slotType: 'input',
       itemDescription: { description: '文件格式为:图象文件名|标准分数' },
     }),
-    span6({
+    span8({
       rowKey: 'row-5',
       label: '图片路径',
       slotName: 'address',
       itemDescription: { description: '试卷图片请按路径存放' },
     }),
-    span6({
+    span8({
       rowKey: 'row-6',
       label: '导入文件',
       prop: 'file',
       slotName: 'upload',
     }),
-    span6({
+    span8({
       rowKey: 'row-7',
       slotName: 'progress',
     }),

src/modules/admin-data/task-setting/index.vue

@@ -7,7 +7,7 @@
         :model="taskSettingModel"
         :items="items"
         :rules="rules"
-        :label-width="useVW(88)"
+        :label-width="useVW(120)"
       >
         <template #form-item-un-mark>
           <span class="un-mark-count">{{ unMarkTasks?.unmarkCount }}</span>
@@ -103,24 +103,24 @@ watch(dataModel, () => {
   taskSettingModel.markingGroupNumber = dataModel.group
 })
 
-const Span5 = defineColumn(_, '', { span: 5 })
+const Span7 = defineColumn(_, '', { span: 7 })
 
 const items = computed<EpFormItem[]>(() => [
-  Span5({
+  Span7({
     rowKey: 'row-1',
     label: '科目',
     prop: 'subjectCode',
     slotType: 'select',
     slot: { options: subjectList.value, onChange: changeModelValue('subject') },
   }),
-  Span5({
+  Span7({
     rowKey: 'row-1',
     label: '大题',
     prop: 'mainNumber',
     slotType: 'select',
     slot: { options: mainQuestionList.value, onChange: changeModelValue('question') },
   }),
-  Span5({
+  Span7({
     rowKey: 'row-2',
     label: '任务设置对像',
     prop: 'settingType',
@@ -132,7 +132,7 @@ const items = computed<EpFormItem[]>(() => [
       ],
     },
   }),
-  Span5({
+  Span7({
     rowKey: 'row-2',
     label: '小组',
     prop: 'markingGroupNumber',
@@ -143,28 +143,28 @@ const items = computed<EpFormItem[]>(() => [
       onChange: changeModelValue('group'),
     },
   }),
-  Span5({
+  Span7({
     rowKey: 'row-2',
     label: '任务余量',
     slotName: 'un-mark',
     hidden: !isGroupSetting.value || !unMarkTasks?.value?.unmarkCount,
   }),
-  Span5({
+  Span7({
     rowKey: 'row-3',
     label: '任务数设置',
     prop: 'markTotalCount',
     slotType: 'input',
     hidden: isGroupSetting.value,
   }),
-  Span5({
+  Span7({
     rowKey: 'row-3',
     label: '每日任务量',
     prop: 'markDayCount',
     slotType: 'input',
     hidden: isGroupSetting.value,
   }),
-  Span5({ rowKey: 'row-3', label: '统一追加量', prop: 'markCount', slotType: 'input', hidden: !isGroupSetting.value }),
-  Span5({ rowKey: 'row-3', slotName: 'confirm' }),
+  Span7({ rowKey: 'row-3', label: '统一追加量', prop: 'markCount', slotType: 'input', hidden: !isGroupSetting.value }),
+  Span7({ rowKey: 'row-3', slotName: 'confirm' }),
 ])
 
 const rules = computed<EpFormRules>(() => {

src/modules/admin-exam/edit-exam/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="p-base">
     <el-card shadow="never">
-      <base-form ref="formRef" :label-width="useVW(130)" :items="items" :rules="rules" :model="model">
+      <base-form ref="formRef" :label-width="useVW(160)" :items="items" :rules="rules" :model="model">
         <el-form-item>
           <confirm-button @confirm="onSubmit" @cancel="toExamMange"></confirm-button>
         </el-form-item>
@@ -59,22 +59,22 @@ const rules: EpFormRules = {
   enable: [{ required: true, message: '是否启用考试' }],
 }
 
-const span6 = defineColumn(_, '', { span: 6 })
+const span8 = defineColumn(_, '', { span: 8 })
 
 const items: EpFormItem[] = [
-  span6({ label: '考试名称', slotType: 'input', prop: 'name' }),
-  span6({
+  span8({ label: '考试名称', slotType: 'input', prop: 'name' }),
+  span8({
     label: '评卷模式',
     slotType: 'select',
     prop: 'markingMode',
     slot: { options: [{ value: 'MOUSE', label: '键盘鼠标模式' }] },
   }),
-  span6({ label: '在线评卷时长', slotType: 'input', prop: 'maxMarkingDuration' }),
-  span6({ label: '抽查卷允许打回', slotType: 'select', prop: 'spotCheckReject', slot: { options: TrueOrFalse } }),
-  span6({ label: '问题卷允许打回', slotType: 'select', prop: 'doubtReject', slot: { options: TrueOrFalse } }),
-  span6({ label: '自动任务回收(分钟)', slotType: 'input', prop: 'maxTaskRecover' }),
-  span6({ label: '用户姓名收集', slotType: 'select', prop: 'userNameCollect', slot: { options: TrueOrFalse } }),
-  span6({ label: '状态', slotType: 'select', prop: 'enable', slot: { options: StatusMap } }),
+  span8({ label: '在线评卷时长', slotType: 'input', prop: 'maxMarkingDuration' }),
+  span8({ label: '抽查卷允许打回', slotType: 'select', prop: 'spotCheckReject', slot: { options: TrueOrFalse } }),
+  span8({ label: '问题卷允许打回', slotType: 'select', prop: 'doubtReject', slot: { options: TrueOrFalse } }),
+  span8({ label: '自动任务回收(分钟)', slotType: 'input', prop: 'maxTaskRecover' }),
+  span8({ label: '用户姓名收集', slotType: 'select', prop: 'userNameCollect', slot: { options: TrueOrFalse } }),
+  span8({ label: '状态', slotType: 'select', prop: 'enable', slot: { options: StatusMap } }),
 ]
 
 /** 编辑模式 */

src/modules/admin-exam/manage/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="full flex direction-column exam-manage-view">
     <div class="p-t-base p-l-base fill-blank">
-      <base-form :items="items" :model="model" :label-width="useVW(66)" size="small">
+      <base-form :items="items" :model="model" :label-width="useVW(88)" size="small">
         <template #form-item-button>
           <el-button type="primary" @click="onSearch">查询</el-button>
           <el-button special @click="onCreateExam">创建考试</el-button>
@@ -59,7 +59,7 @@ const model = reactive<ExtractMultipleApiParams<'getExamList'>>({ name: '', enab
 
 const { defineColumn, _ } = useForm()
 
-const onRow = defineColumn(_, 'row-1', { span: 5 })
+const onRow = defineColumn(_, 'row-1', { span: 6 })
 
 const items: EpFormItem[] = [
   onRow({ label: '考试名称', slotType: 'input', prop: 'name', slot: { clearable: true } }),

src/modules/admin-subject/edit-main-question/index.vue

@@ -3,7 +3,7 @@
     <el-card shadow="never">
       <base-form
         ref="formRef"
-        :label-width="useVW(120)"
+        :label-width="useVW(150)"
         size="small"
         :groups="groups"
         :model="model"
@@ -149,10 +149,10 @@ const groups = computed<FormGroup[]>(() => {
   ]
 })
 
-const Span6 = defineColumn(_, _, { span: 6 })
+const Span8 = defineColumn(_, _, { span: 8 })
 
 const items = computed<EpFormItem[]>(() => [
-  Span6(
+  Span8(
     {
       label: '大题号',
       slotType: 'inputNumber',
@@ -164,8 +164,8 @@ const items = computed<EpFormItem[]>(() => [
     },
     'row-1'
   ),
-  Span6({ label: '大题名称', slotType: 'input', prop: 'mainTitle', slot: { placeholder: '大题名称' } }, 'row-2'),
-  Span6(
+  Span8({ label: '大题名称', slotType: 'input', prop: 'mainTitle', slot: { placeholder: '大题名称' } }, 'row-2'),
+  Span8(
     {
       label: '成绩表对应字段',
       slotType: 'select',
@@ -181,7 +181,7 @@ const items = computed<EpFormItem[]>(() => [
     },
     'row-2'
   ),
-  Span6(
+  Span8(
     {
       label: '小题起始号',
       slotType: 'inputNumber',
@@ -190,16 +190,16 @@ const items = computed<EpFormItem[]>(() => [
     },
     'row-3'
   ),
-  Span6(
+  Span8(
     { label: '小题数量', slotType: 'inputNumber', prop: 'questionCount', slot: { placeholder: '小题数量' } },
     'row-4'
   ),
-  Span6(
+  Span8(
     { label: '小题满分', slotType: 'inputNumber', prop: 'questionScore', slot: { placeholder: '小题满分' } },
     'row-5'
   ),
-  Span6({ label: '间隔分', slotType: 'inputNumber', prop: 'intervalScore', slot: { placeholder: '间隔分' } }, 'row-6'),
-  Span6(
+  Span8({ label: '间隔分', slotType: 'inputNumber', prop: 'intervalScore', slot: { placeholder: '间隔分' } }, 'row-6'),
+  Span8(
     {
       label: '最小阅卷时长(秒)',
       slotType: 'inputNumber',
@@ -208,11 +208,11 @@ const items = computed<EpFormItem[]>(() => [
     },
     'row-7'
   ),
-  Span6(
+  Span8(
     { label: '评卷小组数量', slotType: 'inputNumber', prop: 'groupNumber', slot: { placeholder: '评卷小组数量' } },
     'row-8'
   ),
-  Span6(
+  Span8(
     {
       label: '回评设置',
       slotType: 'select',
@@ -227,31 +227,31 @@ const items = computed<EpFormItem[]>(() => [
     },
     'row-9'
   ),
-  Span6(
+  Span8(
     { label: model.remarkType === 'QUANTITY' ? '数量' : '时间:(近N秒)', prop: 'remarkNumber', slotType: 'inputNumber' },
     'row-10'
   ),
-  Span6(
+  Span8(
     { label: '标准卷分发频度', slotType: 'inputNumber', prop: 'standardRate', slot: { placeholder: '标准卷分发频度' } },
     'row-11'
   ),
-  Span6(
+  Span8(
     { label: '自查卷分发频度', slotType: 'inputNumber', prop: 'selfRate', slot: { placeholder: '自查卷分发频度' } },
     'row-11'
   ),
-  Span6(
+  Span8(
     { label: '系统抽查卷比例', slotType: 'inputNumber', prop: 'systemRate', slot: { placeholder: '系统抽查卷比例' } },
     'row-12'
   ),
-  Span6(
+  Span8(
     {
       label: '档次抽查比例',
       slotName: 'setLevelRange',
     },
     'row-12'
   ),
-  Span6({ slotName: 'expand' }, 'expand'),
-  Span6({ slotName: 'operation' }, 'operation'),
+  Span8({ slotName: 'expand' }, 'expand'),
+  Span8({ slotName: 'operation' }, 'operation'),
 ])
 
 if (isEdit) {

src/modules/admin-subject/manage/index.vue

@@ -35,7 +35,7 @@
     <base-dialog v-model="visibleSubjectEditor" unless :footer="false" destroy-on-close>
       <base-form
         ref="formRef"
-        :label-width="useVW(72)"
+        :label-width="useVW(88)"
         :model="editInfo"
         :items="items"
         :rules="rules"

src/modules/admin-user/bulk-add-user/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="p-base bulk-add-user-view">
     <el-card shadow="never" class="form-card">
-      <base-form ref="formRef" :label-width="useVW(100)" :groups="groups" :model="model" :items="items" :rules="rules">
+      <base-form ref="formRef" :label-width="useVW(130)" :groups="groups" :model="model" :items="items" :rules="rules">
         <el-form-item class="m-t-base form-footer">
           <confirm-button :loading="loading" @confirm="onSubmit" @cancel="cancel"></confirm-button>
         </el-form-item>
@@ -20,7 +20,7 @@ import ConfirmButton from '@/components/common/ConfirmButton.vue'
 import useFetch from '@/hooks/useFetch'
 import useForm from '@/hooks/useForm'
 import useVW from '@/hooks/useVW'
-import useOptions, { DataModel } from '@/hooks/useOptions'
+import useOptions from '@/hooks/useOptions'
 import useMainStore from '@/store/main'
 import { StatusMap, ROLE_OPTION } from '@/constants/dicts'
 
@@ -83,7 +83,7 @@ const groups: FormGroup[] = [
   },
 ]
 
-const span5 = defineColumn(_, '', { span: 5 })
+const span7 = defineColumn(_, '', { span: 7 })
 
 const items = computed<EpFormItem[]>(() => {
   return [
@@ -95,10 +95,10 @@ const items = computed<EpFormItem[]>(() => {
         value: mainStore.myUserInfo?.examName,
       },
       colProp: {
-        span: 5,
+        span: 6,
       },
     },
-    span5({
+    span7({
       label: '科目',
       slotType: 'select',
       prop: 'subjectCode',
@@ -108,7 +108,7 @@ const items = computed<EpFormItem[]>(() => {
         options: subjectList.value,
       },
     }),
-    span5({
+    span7({
       label: '大题',
       slotType: 'select',
       prop: 'mainNumber',
@@ -118,7 +118,7 @@ const items = computed<EpFormItem[]>(() => {
         options: mainQuestionList.value,
       },
     }),
-    span5({
+    span7({
       label: '小组',
       slotType: 'select',
       prop: 'markingGroupNumber',
@@ -128,7 +128,7 @@ const items = computed<EpFormItem[]>(() => {
         onChange: changeModelValue('group'),
       },
     }),
-    span5({
+    span7({
       label: '用户角色',
       slotType: 'select',
       prop: 'role',
@@ -137,7 +137,7 @@ const items = computed<EpFormItem[]>(() => {
         placeholder: '设置用户角色',
       },
     }),
-    span5({
+    span7({
       rowKey: 'row-6',
       label: '自定义前缀',
       slotType: 'input',
@@ -146,7 +146,7 @@ const items = computed<EpFormItem[]>(() => {
         placeholder: '自定义账号前缀',
       },
     }),
-    span5({
+    span7({
       rowKey: 'row-6',
       label: '账号代码位数',
       slotType: 'inputNumber',
@@ -155,7 +155,7 @@ const items = computed<EpFormItem[]>(() => {
         placeholder: '账号代码位数',
       },
     }),
-    span5({
+    span7({
       rowKey: 'row-7',
       label: '起始数',
       slotType: 'input',
@@ -164,7 +164,7 @@ const items = computed<EpFormItem[]>(() => {
         placeholder: '起始数',
       },
     }),
-    span5({
+    span7({
       rowKey: 'row-7',
       label: '账号数量',
       slotType: 'input',
@@ -173,7 +173,7 @@ const items = computed<EpFormItem[]>(() => {
         placeholder: '账号数量',
       },
     }),
-    span5({
+    span7({
       rowKey: 'row-8',
       label: '用户密码',
       slotType: 'input',
@@ -183,7 +183,7 @@ const items = computed<EpFormItem[]>(() => {
         placeholder: '设置用户密码',
       },
     }),
-    span5({
+    span7({
       rowKey: 'row-9',
       label: '状态',
       slotType: 'select',

src/modules/admin-user/edit-user/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="p-base edit-user-view">
     <el-card shadow="never" class="form-card">
-      <base-form ref="formRef" :model="model" :items="items" :rules="rules" :label-width="useVW(72)">
+      <base-form ref="formRef" :model="model" :items="items" :rules="rules" :label-width="useVW(90)">
         <el-form-item class="m-t-base form-footer">
           <confirm-button :loading="loading" @confirm="onSubmit" @cancel="cancel"></confirm-button>
         </el-form-item>
@@ -199,7 +199,7 @@ function cancel() {
 <style scoped lang="scss">
 .edit-user-view {
   .form-card {
-    padding-right: 1100px;
+    padding-right: 1000px;
   }
 }
 </style>

src/modules/admin-user/manage/index.vue

@@ -8,7 +8,7 @@
         ref="formRef"
         class="full-w"
         size="small"
-        :label-width="useVW('48px')"
+        :label-width="useVW(60)"
         :disabled="loading"
         :model="model"
         :transition="false"

src/modules/analysis/group-monitoring/hooks/useFormFilter.ts

@@ -41,7 +41,6 @@ const useFormFilter = () => {
 
   const items = computed<EpFormItem[]>(() => [
     OneRowSpan5({
-      labelWidth: useVW(40),
       label: '科目',
       prop: 'subjectCode',
       slotType: 'select',

src/modules/analysis/group-monitoring/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex direction-column full group-monitoring-view">
     <div class="p-l-base p-r-base p-t-medium-base fill-blank">
-      <base-form size="small" :label-width="useVW(48)" :disabled="loading" :model="model" :items="items">
+      <base-form size="small" :label-width="useVW(60)" :disabled="loading" :model="model" :items="items">
         <template #form-item-button-group>
           <el-button :loading="loading" type="primary" @click="onSearch">刷新</el-button>
         </template>

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

@@ -1,8 +1,8 @@
 <template>
   <div class="p-base radius-base fill-blank">
-    <base-form size="small" :items="items" :model="model" :label-width="useVW(40)">
+    <base-form size="small" :items="items" :model="model">
       <template #form-item-operation>
-        <el-button type="primary" @click="onSearch">查询</el-button>
+        <el-button class="m-l-base" type="primary" @click="onSearch">查询</el-button>
         <el-button type="primary" custom-1 @click="onExport">导出</el-button>
       </template>
     </base-form>

src/modules/analysis/monitoring/index.vue

@@ -43,7 +43,7 @@
       </div>
     </div>
     <base-dialog v-model="visibleSetting" title="参数设置" :footer="false" destroy-on-close>
-      <base-form :label-width="useVW(72)" :model="model" :items="formItems">
+      <base-form :label-width="useVW(88)" :model="model" :items="formItems">
         <el-form-item>
           <confirm-button @confirm="onConfirm" @cancel="toggleSetting(false)"></confirm-button>
         </el-form-item>

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

@@ -6,7 +6,7 @@
     destroy-on-close
     @update:model-value="(v) => emit('update:modelValue', v)"
   >
-    <base-form ref="formRef" :rules="rules" :items="items" :model="model" :label-width="useVW(100)" :disabled="loading">
+    <base-form ref="formRef" :rules="rules" :items="items" :model="model" :label-width="useVW(110)" :disabled="loading">
       <template #form-item-markerName>
         {{ data?.markerName }}
       </template>

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

@@ -118,7 +118,7 @@ function setPopoverRefs(id: number, popover: PopoverInstance) {
 
 /** on popover show */
 function onPopoverShow(id: number) {
-  Object.keys(popovers).forEach((k) => {
+  Object.keys(popovers.value).forEach((k) => {
     if (k !== `popovers-${id}`) {
       popovers.value[k]?.hide()
     }

src/modules/analysis/personnel-statistics/hooks/useStatisticsFilter.ts

@@ -63,7 +63,7 @@ const useStatisticsFilter = () => {
 
   const items = computed<EpFormItem[]>(() => [
     OneRowSpan5({
-      labelWidth: useVW(40),
+      labelWidth: useVW(52),
       label: '科目',
       prop: 'subjectCode',
       slotType: 'select',
@@ -97,7 +97,7 @@ const useStatisticsFilter = () => {
       slotName: 'button-group',
     }),
     TwoRowSpan5({
-      labelWidth: useVW(40),
+      labelWidth: useVW(52),
       label: '时间',
       slotType: 'dateTime',
       prop: 'time',

src/modules/analysis/personnel-statistics/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex direction-column full personnel-statistics-view">
     <div class="p-l-base p-r-base p-t-medium-base fill-blank filter-form">
-      <base-form size="small" :label-width="useVW(80)" :disabled="loading" :model="model" :items="items">
+      <base-form size="small" :label-width="useVW(88)" :disabled="loading" :model="model" :items="items">
         <template #form-item-button-group>
           <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           <el-button :loading="exporting" type="primary" custom-1 @click="onExport">导出</el-button>

src/modules/analysis/statistics/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex direction-column full analysis-monitor-view">
     <div class="p-l-base p-t-medium-base fill-blank">
-      <base-form :disabled="loading" size="small" :label-width="useVW(52)" :model="model" :items="formItems">
+      <base-form :disabled="loading" size="small" :label-width="useVW(60)" :model="model" :items="formItems">
         <template #form-item-operation>
           <el-button :loading="loading" type="primary" @click="onRefresh">刷新</el-button>
         </template>
@@ -95,7 +95,7 @@ const formItems = computed<EpFormItem[]>(() => [
     label: '科目',
     slotType: 'select',
     prop: 'subjectCode',
-    labelWidth: useVW(42),
+    labelWidth: useVW(52),
     slot: {
       options: subjectList.value,
       onChange: changeModelValue('subject'),

src/modules/expert/assess/index.vue

@@ -22,7 +22,7 @@
         </div>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(40)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(52)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>

src/modules/expert/expert/index.vue

@@ -22,7 +22,7 @@
         </div>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(60)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(72)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>

src/modules/expert/sample/index.vue

@@ -22,7 +22,7 @@
         </div>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(40)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(52)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>

src/modules/expert/standard/index.vue

@@ -14,7 +14,7 @@
         </div>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank scroll-auto m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(40)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(52)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>

src/modules/expert/training/index.vue

@@ -20,7 +20,7 @@
         </div>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(40)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(52)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>

src/modules/marking/arbitration/index.vue

@@ -27,7 +27,7 @@
         ></scoring-panel-with-confirm>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(62)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(72)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>
@@ -163,7 +163,6 @@ const formItems = computed<EpFormItem[]>(() => [
   span10({
     rowKey: 'row-1',
     label: '状态',
-    labelWidth: useVW(40),
     prop: 'status',
     slotType: 'select',
     slot: {

src/modules/marking/assess/index.vue

@@ -4,7 +4,7 @@
       <div class="flex-1 p-base radius-base fill-blank m-r-base form-card">
         <base-form
           ref="formRef"
-          :label-width="useVW(62)"
+          :label-width="useVW(72)"
           :disabled="loading"
           :groups="groups"
           :rules="rules"

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

@@ -56,7 +56,6 @@
   <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
   <scoring-panel-with-confirm
-    :id="current?.taskId"
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
     :main-number="current?.mainNumber"
@@ -64,8 +63,8 @@
     :toggle-modal="false"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
-  <base-dialog v-model="setExpertPaperVisible" title="设置专家卷" :footer="false" :width="useVW(520)">
-    <base-form size="small" :model="setExpertModel" :items="items" :label-width="useVW(100)">
+  <base-dialog v-model="setExpertPaperVisible" title="设置专家卷" :footer="false" :width="useVW(540)">
+    <base-form size="small" :model="setExpertModel" :items="items" :label-width="useVW(130)">
       <template #form-item-confirm>
         <confirm-button
           class="m-t-base"
@@ -224,24 +223,6 @@ const setExpertModel = reactive<SetExpertModel>({
   forceGroupNumber: 'A',
 })
 
-// const { fetch: getForceCheckGroupList, result: forceCheckGroupListResult } = useFetch('getForceCheckGroupList')
-
-// const forceCheckGroup = computed(() =>
-//   forceCheckGroupListResult?.value?.map((group) => {
-//     return { ...group, label: group.forceGroupNumber, labelSlot: `第${group.forceGroupNumber}组` }
-//   })
-// )
-
-// watch(
-//   query,
-//   () => {
-//     if (query.subjectCode && query.mainNumber) {
-//       getForceCheckGroupList({ subjectCode: query.subjectCode as string, mainNumber: +query.mainNumber })
-//     }
-//   },
-//   { deep: true, immediate: true }
-// )
-
 const items = computed<EpFormItem[]>(() => {
   let paperTypeItems: EpFormItem[] = [
     {

src/modules/marking/inquiry/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="p-base full mark-inquiry-view">
     <div class="full radius-base fill-blank p-large">
-      <base-form ref="formRef" :disabled="saving" :label-width="useVW(72)" :rules="rules" :items="items" :model="model">
+      <base-form ref="formRef" :disabled="saving" :label-width="useVW(88)" :rules="rules" :items="items" :model="model">
         <template #form-item-button-group>
           <el-button type="primary" @click="onSearch">抽查</el-button>
           <!-- <el-button type="primary">高级抽查</el-button> -->

src/modules/marking/problem/index.vue

@@ -29,7 +29,7 @@
         ></scoring-panel-with-confirm>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(62)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(78)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>
@@ -181,7 +181,6 @@ const formItems = computed<EpFormItem[]>(() => [
   span10({
     rowKey: 'row-1',
     label: '状态',
-    labelWidth: useVW(40),
     prop: 'status',
     slotType: 'select',
     slot: {

src/modules/marking/repeat/index.vue

@@ -29,7 +29,7 @@
         ></scoring-panel-with-confirm>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(62)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(80)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>

src/modules/marking/similar/index.vue

@@ -110,7 +110,7 @@ const formItems = computed<EpFormItem[]>(() => [
   span10({
     rowKey: 'row-1',
     label: '雷同判定',
-    labelWidth: useVW(72),
+    labelWidth: useVW(88),
     prop: 'status',
     slotType: 'select',
     slot: {

src/modules/marking/statistics/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex direction-column full">
     <div class="p-t-base p-l-base fill-blank">
-      <base-form :items="items" :model="model" :label-width="useVW(66)" size="small">
+      <base-form :items="items" :model="model" :label-width="useVW(80)" size="small">
         <template #form-item-button>
           <el-button type="primary" @click="onSearch">查询</el-button>
         </template>

src/modules/monitor/system-check/index.vue

@@ -25,7 +25,7 @@
         </div>
       </div>
       <div class="flex direction-column p-base radius-base fill-blank m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(40)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(52)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>
@@ -195,7 +195,6 @@ const formItems = computed<EpFormItem[]>(() => [
   span10({
     rowKey: 'row-1',
     label: '档次',
-    labelWidth: useVW(40),
     prop: 'level',
     slotType: 'select',
     slot: {

src/modules/monitor/training-monitoring/hooks/useFormFilter.ts

@@ -73,7 +73,7 @@ const useFormFilter = () => {
         label: '科目',
         prop: 'subjectCode',
         slotType: 'select',
-        labelWidth: useVW(60),
+        labelWidth: useVW(72),
         slot: {
           options: subjectList.value,
           onChange: changeModelValue('subject'),

src/modules/monitor/training-monitoring/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex direction-column full training-monitoring-view">
     <div class="p-l-base p-r-base p-t-medium-base fill-blank filter-form">
-      <base-form ref="formRef" size="small" :label-width="useVW(84)" :disabled="loading" :model="model" :items="items">
+      <base-form ref="formRef" size="small" :label-width="useVW(100)" :disabled="loading" :model="model" :items="items">
         <template #form-item-operation>
           <el-button type="primary" @click="onSearch">查询</el-button>
         </template>

src/modules/quality/ending-check/components/EndCheck.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="radius-base">
     <div class="fill-blank radius-base p-t-base">
-      <base-form :items="items" :model="model" :label-width="useVW(66)" size="small">
+      <base-form :items="items" :model="model" :label-width="useVW(80)" size="small">
         <template #form-item-button>
           <el-button type="primary" @click="onStartCheck">开始检查</el-button>
         </template>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="full">
     <div class="p-l-base p-t-medium-base fill-blank">
-      <base-form size="small" :label-width="useVW(52)" :model="model" :items="items">
+      <base-form size="small" :label-width="useVW(66)" :model="model" :items="items">
         <template #form-item-search>
           <el-button type="primary" @click="onSearch">查询</el-button>
         </template>
@@ -82,7 +82,7 @@ const items = computed<EpFormItem[]>(() => {
       label: '科目',
       slotType: 'select',
       prop: 'subjectCode',
-      labelWidth: useVW(40),
+      labelWidth: useVW(52),
       slot: { options: subjectList.value, onChange: changeModelValue('subject'), disabled: true },
     }),
     OneRowSpan4({

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

@@ -75,7 +75,7 @@ const items = computed<EpFormItem[]>(() => {
     }),
     OneRowSpan5({
       label: '组长',
-      labelWidth: useVW(60),
+      labelWidth: useVW(72),
       prop: 'markingGroupLeaderId',
       slotType: 'select',
       slot: { options: [{ label: '全部', value: 0 }].concat(userList.value?.result?.map(transformUserOption) || []) },

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

@@ -23,7 +23,7 @@
         </div>
       </div>
       <div class="p-base radius-base fill-blank scroll-auto m-l-base table-view">
-        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(62)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="useVW(80)">
           <template #form-item-search>
             <el-button type="primary" @click="onSearch">查询</el-button>
           </template>