소스 검색

bug fix 和优化

刘洋 2 년 전
부모
커밋
9c51ae4652
39개의 변경된 파일116개의 추가작업 그리고 87개의 파일을 삭제
  1. 40 15
      src/components/shared/MarkHeader.vue
  2. 1 1
      src/components/shared/ScoringPanelWithConfirm.vue
  3. 20 9
      src/components/shared/message/Message.vue
  4. 3 10
      src/modules/admin-subject/manage/index.vue
  5. 2 2
      src/modules/admin-subject/struct/index.vue
  6. 1 1
      src/modules/admin-user/bulk-add-user/index.vue
  7. 1 1
      src/modules/admin-user/edit-user/index.vue
  8. 6 6
      src/modules/admin-user/manage/index.vue
  9. 1 1
      src/modules/analysis/group-monitoring/hooks/useFormFilter.ts
  10. 1 1
      src/modules/analysis/group-monitoring/index.vue
  11. 1 1
      src/modules/analysis/monitoring/index.vue
  12. 2 2
      src/modules/analysis/personnel-statistics/components/SetWorkload.vue
  13. 1 1
      src/modules/analysis/personnel-statistics/components/StatisticsGroup.vue
  14. 1 1
      src/modules/analysis/personnel-statistics/components/StatisticsPersonnel.vue
  15. 3 3
      src/modules/analysis/personnel-statistics/hooks/useStatisticsFilter.ts
  16. 1 1
      src/modules/analysis/personnel-statistics/index.vue
  17. 3 3
      src/modules/analysis/statistics/index.vue
  18. 1 1
      src/modules/bootstrap/change-password/index.vue
  19. 2 2
      src/modules/example/Components.vue
  20. 1 1
      src/modules/expert/assess/index.vue
  21. 1 1
      src/modules/expert/expert/index.vue
  22. 1 1
      src/modules/expert/sample/index.vue
  23. 1 1
      src/modules/expert/standard/index.vue
  24. 1 1
      src/modules/expert/training/index.vue
  25. 1 1
      src/modules/marking/arbitration/index.vue
  26. 1 1
      src/modules/marking/assess/index.vue
  27. 2 2
      src/modules/marking/inquiry-result/index.vue
  28. 1 1
      src/modules/marking/inquiry/index.vue
  29. 1 1
      src/modules/marking/problem/index.vue
  30. 2 2
      src/modules/marking/repeat/index.vue
  31. 1 1
      src/modules/marking/similar/index.vue
  32. 1 1
      src/modules/marking/statistics/index.vue
  33. 1 1
      src/modules/monitor/system-check/index.vue
  34. 2 2
      src/modules/monitor/training-monitoring/hooks/useFormFilter.ts
  35. 1 1
      src/modules/monitor/training-monitoring/index.vue
  36. 1 1
      src/modules/quality/ending-check/components/EndCheck.vue
  37. 2 2
      src/modules/quality/self-check/index.vue
  38. 2 2
      src/modules/quality/spot-check/index.vue
  39. 1 1
      src/modules/quality/subjective-check/index.vue

+ 40 - 15
src/components/shared/MarkHeader.vue

@@ -150,15 +150,35 @@ const frontColor = ref<string>('')
 /** background-color */
 const backgroundColor = ref<string>('')
 
+const saveMarkSet = () => {
+  if (fullPath && !!sessionStorage.get('LOGIN_RESULT')) {
+    mainStore.setUserMarkConfig({
+      [fullPath]: {
+        center: center.value,
+        ratio: ratio.value,
+        rotate: rotate.value,
+        frontColor: frontColor.value,
+        backgroundColor: backgroundColor.value,
+      },
+    })
+  }
+}
+
 watch(center, () => emitEvent('center', center.value))
 
 watch(ratio, () => emitEvent('scale-change', ratio.value))
 
 watch(rotate, () => emitEvent('rotate', rotate.value))
 
-watch(frontColor, () => emitEvent('front-color', frontColor.value))
+watch(frontColor, () => {
+  emitEvent('front-color', frontColor.value)
+  saveMarkSet()
+})
 
-watch(backgroundColor, () => emitEvent('background-color', backgroundColor.value))
+watch(backgroundColor, () => {
+  emitEvent('background-color', backgroundColor.value)
+  saveMarkSet()
+})
 
 const validVal = (val: number, max: number, min: number) => {
   return Math.min(max, Math.max(val, min))
@@ -171,18 +191,23 @@ const onOperationClick = (button: HeaderButton) => {
   switch (button.type) {
     case 'scale-up':
       ratio.value = validVal(add(ratio.value, 0.1), 2, 0.5)
+      saveMarkSet()
       break
     case 'scale-down':
       ratio.value = validVal(minus(ratio.value, 0.1), 2, 0.5)
+      saveMarkSet()
       break
     case 'rotate':
       rotate.value = (rotate.value + 90) % 360
+      saveMarkSet()
       break
     case 'center':
       center.value = !center.value
+      saveMarkSet()
       break
     default:
       emitEvent(button.type)
+      saveMarkSet()
       break
   }
 }
@@ -233,19 +258,19 @@ const willLogout = async () => {
     logout()
   }
 }
-onUnmounted(() => {
-  if (fullPath && !!sessionStorage.get('LOGIN_RESULT')) {
-    mainStore.setUserMarkConfig({
-      [fullPath]: {
-        center: center.value,
-        ratio: ratio.value,
-        rotate: rotate.value,
-        frontColor: frontColor.value,
-        backgroundColor: backgroundColor.value,
-      },
-    })
-  }
-})
+// onUnmounted(() => {
+//   if (fullPath && !!sessionStorage.get('LOGIN_RESULT')) {
+//     mainStore.setUserMarkConfig({
+//       [fullPath]: {
+//         center: center.value,
+//         ratio: ratio.value,
+//         rotate: rotate.value,
+//         frontColor: frontColor.value,
+//         backgroundColor: backgroundColor.value,
+//       },
+//     })
+//   }
+// })
 </script>
 
 <style scoped lang="scss">

+ 1 - 1
src/components/shared/ScoringPanelWithConfirm.vue

@@ -6,7 +6,7 @@
     :main-number="props.mainNumber"
     @submit="onSubmit"
   ></scoring-panel>
-  <base-dialog v-model="submitModalVisible" unless :width="useVW(260)" center>
+  <base-dialog v-model="submitModalVisible" unless :width="260" center>
     <div class="text-center question-name">{{ questionInfo?.mainNumber }} {{ questionInfo?.mainTitle }}</div>
     <div class="fill-lighter p-t-base text-center">
       <div class="total-score-title">— 总分 —</div>

+ 20 - 9
src/components/shared/message/Message.vue

@@ -34,7 +34,7 @@
             <pre class="flex-1 message-content" v-html="message.content"></pre> -->
             <div class="send-user truncate">{{ message.sendUserName }}</div>
             <!-- <div class="send-content truncate">{{ message.content }}</div> -->
-            <div class="send-content truncate" v-html="message.content"></div>
+            <div class="send-content truncate">{{ transContent(message.content) }}</div>
           </div>
         </div>
         <confirm-button
@@ -78,7 +78,9 @@ const props = withDefaults(
   }>(),
   { type: 'view', replyUserId: null, paperPath: null, messageVisible: false }
 )
-
+const transContent = (content: any) => {
+  return content.replaceAll('<div>', ' ').replaceAll('<br>', ' ').replaceAll('<\/div>', '').replaceAll('<\/br>', '')
+}
 const MessageComponent = defineComponent({
   setup() {
     const mainStore = useMainStore()
@@ -106,7 +108,16 @@ watch(
       if (!newMsgs.length) {
         return
       }
-      let hasRecentSixSecondsMsg = new Date(newMsgs[0].sendTime).getTime() > Date.now() - 6000
+
+      let newMsgTime = Math.max.apply(
+        Math,
+        newMsgs.map((item: any) => {
+          return new Date(item.sendTime).getTime()
+        })
+      )
+
+      // let hasRecentSixSecondsMsg = new Date(newMsgs[0].sendTime).getTime() > Date.now() - 6000
+      let hasRecentSixSecondsMsg = newMsgTime > Date.now() - 6000
       if (!lastMsgs.messages.length && hasRecentSixSecondsMsg) {
         messageWindowType.value = 'view'
         visibleMessageWindow.value = true
@@ -118,12 +129,12 @@ watch(
           return new Date(item.sendTime).getTime()
         })
       )
-      let newMsgTime = Math.max.apply(
-        Math,
-        newMsgs.map((item: any) => {
-          return new Date(item.sendTime).getTime()
-        })
-      )
+      // let newMsgTime = Math.max.apply(
+      //   Math,
+      //   newMsgs.map((item: any) => {
+      //     return new Date(item.sendTime).getTime()
+      //   })
+      // )
       if (newMsgTime > recentMsgTime && hasRecentSixSecondsMsg) {
         messageWindowType.value = 'view'
         visibleMessageWindow.value = true

+ 3 - 10
src/modules/admin-subject/manage/index.vue

@@ -12,7 +12,7 @@
           <template #column-operation="{ row }">
             <el-button type="primary" link @click="onEdit(row)">编辑</el-button>
             <el-popconfirm
-              :width="useVW(220)"
+              :width="'220px'"
               hide-icon
               :title="`确认${row.enable ? '禁用' : '启用'}科目?`"
               @confirm="toggleEnable(row)"
@@ -23,7 +23,7 @@
                 </el-button>
               </template>
             </el-popconfirm>
-            <el-popconfirm :width="useVW(220)" hide-icon :title="`确认删除科目?`" @confirm="onDelete(row)">
+            <el-popconfirm :width="'220px'" hide-icon :title="`确认删除科目?`" @confirm="onDelete(row)">
               <template #reference>
                 <el-button type="primary" link>删除</el-button>
               </template>
@@ -33,14 +33,7 @@
       </el-card>
     </div>
     <base-dialog v-model="visibleSubjectEditor" unless :footer="false" destroy-on-close>
-      <base-form
-        ref="formRef"
-        :label-width="useVW(88)"
-        :model="editInfo"
-        :items="items"
-        :rules="rules"
-        :loading="saving"
-      >
+      <base-form ref="formRef" :label-width="'88px'" :model="editInfo" :items="items" :rules="rules" :loading="saving">
         <el-form-item class="m-t-base">
           <confirm-button :loading="saving" @confirm="onSubmit" @cancel="toggleVisible(false)"></confirm-button>
         </el-form-item>

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

@@ -16,7 +16,7 @@
         <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)">
+            <el-popconfirm :width="'220px'" hide-icon :title="`确认删除题目?`" @confirm="onDelete(row)">
               <template #reference>
                 <el-button type="primary" link>删除</el-button>
               </template>
@@ -29,7 +29,7 @@
     <base-dialog v-model="visibleSubQuestionEditor" unless :footer="false" destroy-on-close>
       <base-form
         ref="formRef"
-        :label-width="useVW(72)"
+        :label-width="'72px'"
         :model="editSubInfo"
         :items="items"
         :rules="rules"

+ 1 - 1
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(130)" :groups="groups" :model="model" :items="items" :rules="rules">
+      <base-form ref="formRef" :label-width="'130px'" :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>

+ 1 - 1
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(90)">
+      <base-form ref="formRef" :model="model" :items="items" :rules="rules" :label-width="'90px'">
         <el-form-item class="m-t-base form-footer">
           <confirm-button :loading="loading" @confirm="onSubmit" @cancel="cancel"></confirm-button>
         </el-form-item>

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

@@ -9,7 +9,7 @@
         ref="formRef"
         class="full-w"
         size="small"
-        :label-width="useVW(60)"
+        :label-width="'60px'"
         :disabled="loading"
         :model="model"
         :transition="false"
@@ -36,7 +36,7 @@
           <el-button size="small" type="primary" @click="onBulkAddUser">批量新增</el-button>
           <el-popconfirm
             v-if="hasSelected"
-            :width="useVW(220)"
+            :width="'220px'"
             hide-icon
             title="是否重置选中用户密码?"
             @confirm="handleResetPwd"
@@ -48,7 +48,7 @@
           <el-button v-else size="small" type="primary" @click="checkSelected('reset')">重置密码</el-button>
           <el-popconfirm
             v-if="hasSelected"
-            :width="useVW(220)"
+            :width="'220px'"
             hide-icon
             title="是否禁用选中用户?"
             @confirm="handleDisableUsers"
@@ -72,13 +72,13 @@
         >
           <template #column-operation="{ row }">
             <el-button type="primary" link @click="onEditUser(row)">修改</el-button>
-            <el-popconfirm :width="useVW(220)" hide-icon title="确认重置用户密码?" @confirm="onSingleResetUserPwd(row)">
+            <el-popconfirm :width="'220px'" hide-icon title="确认重置用户密码?" @confirm="onSingleResetUserPwd(row)">
               <template #reference>
                 <el-button type="primary" link>重置密码</el-button>
               </template>
             </el-popconfirm>
             <el-popconfirm
-              :width="useVW(220)"
+              :width="'220px'"
               hide-icon
               :title="`确认${row.enable ? '禁用' : '启用'}用户?`"
               @confirm="onDisableUser(row)"
@@ -94,7 +94,7 @@
         <el-pagination v-bind="pagination" v-model:current-page="currentPage" background right></el-pagination>
       </el-card>
     </div>
-    <base-dialog :width="useVW(380)" title="导入/导出" destroy-on-close>
+    <base-dialog :width="380" title="导入/导出" destroy-on-close>
       <template #footer>
         <confirm-button @confirm="handleResetPwd" @cancel="() => {}"></confirm-button>
       </template>

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

@@ -70,7 +70,7 @@ const useFormFilter = () => {
       },
     }),
     OneRowSpan5({
-      labelWidth: useVW(20),
+      labelWidth: '20px',
       slotName: 'button-group',
     }),
   ])

+ 1 - 1
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(60)" :disabled="loading" :model="model" :items="items">
+      <base-form size="small" :label-width="'60px'" :disabled="loading" :model="model" :items="items">
         <template #form-item-button-group>
           <el-button :loading="loading" type="primary" @click="onSearch">刷新</el-button>
         </template>

+ 1 - 1
src/modules/analysis/monitoring/index.vue

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

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

@@ -2,7 +2,7 @@
   <base-dialog
     title="设置工作量"
     v-bind="attrs"
-    :width="useVW(500)"
+    :width="500"
     :footer="false"
     destroy-on-close
     @update:model-value="(v) => emit('update:modelValue', v)"
@@ -12,7 +12,7 @@
       :rules="rules"
       :items="items"
       :model="model"
-      :label-width="useVW(110)"
+      :label-width="'110px'"
       :disabled="loading || setting"
     >
       <template #form-item-markerName>

+ 1 - 1
src/modules/analysis/personnel-statistics/components/StatisticsGroup.vue

@@ -7,7 +7,7 @@
       size="small"
       :columns="columns"
       :data="tableData"
-      :height="useVW(300)"
+      :height="'300px'"
       highlight-current-row
       @current-change="onCurrentChange"
     >

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

@@ -7,7 +7,7 @@
       size="small"
       :data="tableData"
       :columns="columns"
-      :height="useVW(300)"
+      :height="'300px'"
       highlight-current-row
       @current-change="onCurrentChange"
       @row-dblclick="onDbClick"

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

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

+ 1 - 1
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" style="padding-bottom: 10px">
-      <base-form size="small" :label-width="useVW(88)" :disabled="loading" :model="model" :items="items">
+      <base-form size="small" :label-width="'88px'" :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>

+ 3 - 3
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(60)" :model="model" :items="formItems">
+      <base-form :disabled="loading" size="small" :label-width="'60px'" :model="model" :items="formItems">
         <template #form-item-operation>
           <el-button :disabled="loading" :loading="loading" type="primary" @click="onRefresh">刷新</el-button>
         </template>
@@ -97,7 +97,7 @@ const formItems = computed<EpFormItem[]>(() => [
     label: '科目',
     slotType: 'select',
     prop: 'subjectCode',
-    labelWidth: useVW(52),
+    labelWidth: '52px',
     slot: {
       options: subjectList.value,
       onChange: changeModelValue('subject'),
@@ -136,7 +136,7 @@ const formItems = computed<EpFormItem[]>(() => [
     },
   }),
   OneRowSpan4({
-    labelWidth: useVW(20),
+    labelWidth: '20px',
     slotName: 'operation',
   }),
 ])

+ 1 - 1
src/modules/bootstrap/change-password/index.vue

@@ -3,7 +3,7 @@
     <div class="change-pwd-modal">
       <div class="p-l-large change-pwd-modal-header">请修改密码</div>
       <div class="change-pwd-modal-content">
-        <base-form ref="formRef" :model="userModel" :rules="rules" :items="items" :label-width="useVW(90)" size="large">
+        <base-form ref="formRef" :model="userModel" :rules="rules" :items="items" :label-width="'90px'" size="large">
           <template #form-item-confirm>
             <confirm-button class="m-t-large" size="large" @confirm="onSubmit" @cancel="onCancel"></confirm-button>
           </template>

+ 2 - 2
src/modules/example/Components.vue

@@ -48,13 +48,13 @@
         :items="items"
         :model="formModel"
         :rules="forRules"
-        :label-width="useVW('110px')"
+        :label-width="'110px'"
       >
       </base-form>
     </div>
     <div ref="epFormRef1" class="example-block">
       <h3 class="example-title">InlineForm</h3>
-      <base-form v-bind="form" :items="inlineItems" :model="formModel" size="small" :label-width="useVW('88px')">
+      <base-form v-bind="form" :items="inlineItems" :model="formModel" size="small" :label-width="'88px'">
         <template #form-item-cao-zuo-col>
           <el-button type="primary">132</el-button>
         </template>

+ 1 - 1
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(52)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="'52px'">
           <template #form-item-search>
             <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>

+ 1 - 1
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(72)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="'72px'">
           <template #form-item-search>
             <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>

+ 1 - 1
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(52)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="'52px'">
           <template #form-item-search>
             <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>

+ 1 - 1
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 ref="formRef" size="small" :model="formModel" :items="formItems" :label-width="useVW(52)">
+        <base-form ref="formRef" size="small" :model="formModel" :items="formItems" :label-width="'52px'">
           <template #form-item-search>
             <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>

+ 1 - 1
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(52)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="'52px'">
           <template #form-item-search>
             <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>

+ 1 - 1
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(72)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="'72px'">
           <template #form-item-search>
             <el-button :disabled="loading" :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>

+ 1 - 1
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(72)"
+          :label-width="'72px'"
           :disabled="loading"
           :groups="groups"
           :rules="rules"

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

@@ -66,8 +66,8 @@
     :auto-visible="false"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
-  <base-dialog v-model="setExpertPaperVisible" title="设置专家卷" :footer="false" :width="useVW(540)">
-    <base-form size="small" :model="setExpertModel" :items="items" :label-width="useVW(130)">
+  <base-dialog v-model="setExpertPaperVisible" title="设置专家卷" :footer="false" :width="540">
+    <base-form size="small" :model="setExpertModel" :items="items" :label-width="'130px'">
       <template #form-item-confirm>
         <confirm-button
           class="m-t-base"

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

@@ -195,7 +195,7 @@ const items = computed<EpFormItem[]>(() => [
   }),
   FourRow({
     label: '至',
-    labelWidth: useVW(35),
+    labelWidth: '35px',
     slotType: 'inputNumber',
     prop: 'scoreEnd',
     slot: {

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

@@ -40,7 +40,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(78)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="'78px'">
           <template #form-item-search>
             <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>

+ 2 - 2
src/modules/marking/repeat/index.vue

@@ -37,7 +37,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(80)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="'80px'">
           <template #form-item-search>
             <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>
@@ -176,7 +176,7 @@ const formItems = computed<EpFormItem[]>(() => [
   span10({
     rowKey: 'row-1',
     label: '状态',
-    labelWidth: useVW(40),
+    labelWidth: '40px',
     prop: 'confirm',
     slotType: 'select',
     slot: {

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

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

+ 1 - 1
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(80)" size="small">
+      <base-form :items="items" :model="model" :label-width="'80px'" size="small">
         <template #form-item-button>
           <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
         </template>

+ 1 - 1
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(52)">
+        <base-form size="small" :model="formModel" :items="formItems" :label-width="'52px'">
           <template #form-item-search>
             <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
           </template>

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

@@ -89,7 +89,7 @@ const useFormFilter = () => {
         label: '科目',
         prop: 'subjectCode',
         slotType: 'select',
-        labelWidth: useVW(72),
+        labelWidth: '72px',
         slot: {
           options: subjectList.value,
           onChange: changeModelValue('subject'),
@@ -123,7 +123,7 @@ const useFormFilter = () => {
         label: '试卷类型',
         slotType: 'select',
         prop: 'markStage',
-        labelWidth: useVW(60),
+        labelWidth: '60px',
         slot: {
           placeholder: '试卷类型',
           options: [

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

@@ -4,7 +4,7 @@
       <base-form
         ref="formRef"
         size="small"
-        :label-width="useVW(100)"
+        :label-width="'100px'"
         :disabled="loading"
         :model="model"
         :rules="rules"

+ 1 - 1
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(80)" size="small">
+      <base-form :items="items" :model="model" :label-width="'80px'" size="small">
         <template #form-item-button>
           <el-button type="primary" @click="onStartCheck">开始检查</el-button>
         </template>

+ 2 - 2
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(66)" :model="model" :items="items">
+      <base-form size="small" :label-width="'66px'" :model="model" :items="items">
         <template #form-item-search>
           <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
         </template>
@@ -95,7 +95,7 @@ const items = computed<EpFormItem[]>(() => {
       label: '科目',
       slotType: 'select',
       prop: 'subjectCode',
-      labelWidth: useVW(52),
+      labelWidth: '52px',
       slot: { options: subjectList.value, onChange: changeModelValue('subject'), disabled: true },
     }),
     OneRowSpan4({

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

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

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

@@ -39,7 +39,7 @@
               size="small"
               :model="formModel"
               :items="formItems"
-              :label-width="useVW(80)"
+              :label-width="'80px'"
               style="margin-top: 20px"
             >
               <template #form-item-search>