修改bug

2025-08-08 10:10:02 +08:00 · 2025-08-08 10:10:02 +08:00 · b6d32d892e
parent e075fa8dcd
commit b6d32d892e
13 changed files with 36 additions and 23 deletions
--- a/src/components/Form/src/jeecg/components/JImageUpload.vue
+++ b/src/components/Form/src/jeecg/components/JImageUpload.vue
@ -42,7 +42,6 @@
    :bodyStyle="{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }"
    :footer="null"
    @cancel="handleCancel"
-    :style="{ maxWidth: '90vw' }"
  >
    <img
      ref="previewImgRef"
@ -256,10 +255,21 @@
      /**
       * 预览图片
       */
-      function handlePreview(file) {
-        previewImage.value = file.url || file.thumbUrl;
+      async function handlePreview(file) {
+        if (!file.url && !file.preview) {
+          file.preview = (await getBase64(file.originFileObj)) as string;
+        }
+        previewImage.value = file.url || file.preview;
        previewVisible.value = true;
      }
+      function getBase64(file: File) {
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader();
+          reader.readAsDataURL(file);
+          reader.onload = () => resolve(reader.result);
+          reader.onerror = error => reject(error);
+        });
+      }

      function getAvatarView() {
        if (uploadFileList.length > 0) {
--- a/src/components/Icon/src/IconList.vue
+++ b/src/components/Icon/src/IconList.vue
@ -71,7 +71,7 @@
      //每页条数
      const pageSize = ref<number>(140);
      //下拉分页显示
-      const pageSizeOptions = ref<any>(['10', '20', '50', '100', '140']);
+      const pageSizeOptions = ref<any>(['15', '50', '80', '100']);
      //下拉搜索值
      const searchIconValue = ref<string>('');
      const { clipboardRef, isSuccessRef } = useCopyToClipboard(props.value);
--- a/src/components/Modal/src/index.less
+++ b/src/components/Modal/src/index.less
@ -27,6 +27,9 @@
  }
 }

+.ant-drawer-body {
+  background: url(../resource/img/modalback.png);
+}
 .ant-modal {
  width: 520px;
  padding-bottom: 0;
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@ -1,5 +1,5 @@
 <template>
-  <Header :class="getHeaderClass" style="background-image: url('../resource/img/bj.png');">
+  <Header :class="getHeaderClass"  class="headClass">
    <!-- left start -->
    <div :class="`${prefixCls}-left`" >
      <!-- logo -->
@ -261,4 +261,9 @@
  border-bottom: 0px;
  border-left: 0px;
 }
+.headClass{
+  background-image: url('../resource/img/bj.png')  !important;
+  background-repeat: no-repeat;
+  background-size: 100% auto;
+}
 </style>
--- a/src/settings/componentSetting.ts
+++ b/src/settings/componentSetting.ts
@ -18,7 +18,7 @@ export default {
      totalField: 'total',
    },
    // 可选的分页选项
-    pageSizeOptions: ['10', '50', '80', '100'],
+    pageSizeOptions: ['15', '50', '80', '100'],
    // 表格默认尺寸
    defaultSize: 'middle',
    //默认每页显示多少条
--- a/src/utils/midiaManage/MediaResourcePicker.vue
+++ b/src/utils/midiaManage/MediaResourcePicker.vue
@ -117,7 +117,7 @@ const pagination = reactive({
  total: 0,
  showSizeChanger: true,
  showQuickJumper: true,
-  pageSizeOptions: ['10', '20', '30', '50'],
+  pageSizeOptions: ['15', '50', '80', '100'],
  showTotal: total => `共 ${total} 条`
 });

--- a/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue
+++ b/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue
@ -369,8 +369,3 @@ async function setRangeQuery() {
  display: none !important;
 }
 </style>
-<style lang="less">
-.ant-drawer-body {
-      background: url(../resource/img/modalback.png);
-}
-</style>
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@ -256,8 +256,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
    showIndexColumn: true,
    pagination: {
      current: 1,
-      pageSize: 10,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '80', '100'],
    },
    actionColumn: {
      width: 200,
--- a/src/views/services/serviceDirective/components/ServiceDirectiveAuditList.vue
+++ b/src/views/services/serviceDirective/components/ServiceDirectiveAuditList.vue
@ -96,8 +96,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
    showIndexColumn: true,
    pagination: {
      current: 1,
-      pageSize: 10,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '80', '100'],
    },
    actionColumn: {
      width: 200,
--- a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue
@ -126,8 +126,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
    immediate: false,
    pagination: {
      current: 1,
-      pageSize: 10,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '80', '100'],
    },
    beforeFetch: async (params) => {
      queryParam.izEnabled = '0'
--- a/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue
+++ b/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue
@ -135,7 +135,7 @@
          :dataSource="targetChooseType == 'one' ? (targetType == 'needsync' ? rightNeedAddList : rightSourceList) : rightNeedAddList"
          :columns="targetChooseType == 'one' ? (targetType == 'needsync' ? targetColumns : targetSourceColumns) : targetSourceColumns"
          size="small" :scroll="{ y: '57vh' }"
-          :pagination="{ current: 1, pageSize: 50, total: rightNeedAddList.length, showSizeChanger: true, pageSizeOptions: ['10', '20', '50', '100'] }">
+          :pagination="{ current: 1, pageSize: 50, total: rightNeedAddList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
          <template v-slot:bodyCell="{ column, record, index, text }">
            <template v-if="column.dataIndex === 'izExist'">
              <a-tag v-if="rightSourceList.some(item => item.id === record.id)" color="orange">更新</a-tag>
@ -224,7 +224,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
    pagination: {
      current: 1,
      pageSize: 10,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSizeOptions: ['15', '50', '80', '100'],
    },
    beforeFetch: async (params) => {
      queryParam.izEnabled = '0'
--- a/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom分步骤版本.vue
+++ b/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom分步骤版本.vue
@ -112,7 +112,7 @@
      <a-col :lg="12" :sm="24">
        <a-tag color="green" style="margin-left: 10px;margin-top: 10px;">已选择 {{ rightList.length }} 条</a-tag>
        <BasicTable :dataSource="rightList" :columns="sourceColumns" size="small" :scroll="{ y: '46vh' }"
-          :pagination="{ current: 1, pageSize: 50, total: rightList.length, showSizeChanger: true, pageSizeOptions: ['10', '20', '50', '100'] }">
+          :pagination="{ current: 1, pageSize: 50, total: rightList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
        </BasicTable>
      </a-col>
    </a-row>
@ -157,7 +157,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
    pagination: {
      current: 1,
      pageSize: 10,
-      pageSizeOptions: ['10', '20', '50', '100'],
+      pageSizeOptions: ['15', '50', '80', '100'],
    },
    beforeFetch: async (params) => {
      queryParam.izEnabled = '0'
--- a/src/views/synchronization/directive/syncStep/SyncStepList分步骤源_指令_目标.vue
+++ b/src/views/synchronization/directive/syncStep/SyncStepList分步骤源_指令_目标.vue
@ -53,7 +53,7 @@
        <a-tag color="green" style="margin-left: 10px;margin-top: 10px;">待同步 {{ leftList?.length }} 条</a-tag>
        <BasicTable :dataSource="leftList" :columns="columns" size="small" :scroll="{ y: '61vh' }"
          :showIndexColumn="false"
-          :pagination="{ current: 1, pageSize: 50, total: leftList.length, showSizeChanger: true, pageSizeOptions: ['10', '20', '50', '100'] }">
+          :pagination="{ current: 1, pageSize: 50, total: leftList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
        </BasicTable>
      </a-col>
      <a-col :lg="12" :sm="24">