From 48f5fb2d9a4ea6e0c2e3d66e88928aba90b6857d Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 8 Aug 2025 10:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/jeecg/components/JImageUpload.vue   | 16 +++++++++++++---
 .../src/jeecg/components/JUpload/JUpload.vue     |  4 ++--
 src/components/Icon/src/IconList.vue             |  2 +-
 src/components/Modal/src/index.less              |  3 +++
 src/design/index.less                            |  4 ++--
 src/layouts/default/header/index.vue             |  8 +++++++-
 src/utils/midiaManage/MediaResourcePicker.vue    |  2 +-
 .../admin/IssueInfo/components/IssueInfoForm.vue |  1 +
 .../admin/orginfo/components/OrgInfoForm.vue     |  3 +++
 src/views/admin/workorder/WorkOrderList.vue      |  1 +
 .../workorder/components/WorkOrderModal.vue      |  6 ------
 src/views/iot/baseIot/CheckBaseIotList.vue       |  6 ------
 12 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/components/Form/src/jeecg/components/JImageUpload.vue b/src/components/Form/src/jeecg/components/JImageUpload.vue
index e347f5e..be55c5b 100644
--- 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) {
diff --git a/src/components/Form/src/jeecg/components/JUpload/JUpload.vue b/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
index 351a709..d4d2bc8 100644
--- a/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
+++ b/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
@@ -1,6 +1,6 @@
 <template>
   <div ref="containerRef" :class="`${prefixCls}-container`">
-    <a-upload
+    <a-upload 
       :headers="headers"
       :multiple="multiple"
       :action="uploadUrl"
@@ -22,7 +22,7 @@
         <span>{{ text }}</span>
       </a-button>
     </a-upload>
-    <template v-if="bindProps.fileType=='pdf' && maxCount=='1'">
+    <template v-if="bindProps.fileType=='pdf' && maxCount=='1' && bindProps.value">
       <a style="border:1px solid #d9d9d9;width:60px;text-align:center;border-radius:4px;padding:2px 5px;" @click="handleView({url:getFileAccessHttpUrl(bindProps.value)})">
         <Icon icon="ant-design:search-outlined" style="color: rgb(140, 134, 134)" />
         <span class="ant-upload-text" style="color: rgb(140, 134, 134)" >预览</span>
diff --git a/src/components/Icon/src/IconList.vue b/src/components/Icon/src/IconList.vue
index 7ceebd2..34d4356 100644
--- 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);
diff --git a/src/components/Modal/src/index.less b/src/components/Modal/src/index.less
index 03f9226..26d81e8 100644
--- 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;
diff --git a/src/design/index.less b/src/design/index.less
index 5d4246f..60942ea 100644
--- a/src/design/index.less
+++ b/src/design/index.less
@@ -135,10 +135,10 @@ img, video {
 html[data-theme='light'] {
   .jeecg-form-detail-effect {
     *:not(.ant-select-selection-placeholder){
-      color: #606266!important;
+      // color: #606266!important;
     }
     .ant-row label {
-      color: #797c81 !important;
+      // color: #797c81 !important;
     }
     .ant-select-selector,
     .ant-btn,
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index 2beb017..aa4eaa7 100644
--- 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,10 @@
   border-bottom: 0px;
   border-left: 0px;
 }
+
+.headClass{
+  background-image: url('../resource/img/bj.png')  !important;
+  background-repeat: no-repeat;
+  background-size: 100% auto;
+}
 </style>
diff --git a/src/utils/midiaManage/MediaResourcePicker.vue b/src/utils/midiaManage/MediaResourcePicker.vue
index 40330af..7137723 100644
--- 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} 条`
 });
 
diff --git a/src/views/admin/IssueInfo/components/IssueInfoForm.vue b/src/views/admin/IssueInfo/components/IssueInfoForm.vue
index 7e3b99f..ab7168f 100644
--- a/src/views/admin/IssueInfo/components/IssueInfoForm.vue
+++ b/src/views/admin/IssueInfo/components/IssueInfoForm.vue
@@ -53,6 +53,7 @@ const formData = reactive<Record<string, any>>({
   id: '',
   issueType: '',
   content: '',
+  createTime: '',
 });
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/src/views/admin/orginfo/components/OrgInfoForm.vue b/src/views/admin/orginfo/components/OrgInfoForm.vue
index 6000769..7ea4d7a 100644
--- a/src/views/admin/orginfo/components/OrgInfoForm.vue
+++ b/src/views/admin/orginfo/components/OrgInfoForm.vue
@@ -425,4 +425,7 @@ defineExpose({
 .antd-modal-form {
   padding: 14px;
 }
+.ant-form-item-label{
+  color: white;
+}
 </style>
diff --git a/src/views/admin/workorder/WorkOrderList.vue b/src/views/admin/workorder/WorkOrderList.vue
index fab7716..3ba1bb6 100644
--- a/src/views/admin/workorder/WorkOrderList.vue
+++ b/src/views/admin/workorder/WorkOrderList.vue
@@ -249,3 +249,4 @@ function searchReset() {
   }
 }
 </style>
+
diff --git a/src/views/admin/workorder/components/WorkOrderModal.vue b/src/views/admin/workorder/components/WorkOrderModal.vue
index 39e9c2f..2a9b48f 100644
--- a/src/views/admin/workorder/components/WorkOrderModal.vue
+++ b/src/views/admin/workorder/components/WorkOrderModal.vue
@@ -31,12 +31,6 @@
   </a-drawer>
 
 
-  <j-modal title="反馈" :width="'70vw'" :visible="orgFankuiVisible"  @ok="handleFankuiOk" @cancel="handleOrgFankuiCancel" cancelText="关闭">
-    <!-- <template #footer>
-      <a-button @click="handleOrgFankuiCancel">关闭</a-button>
-    </template> -->
-  </j-modal>
-
   
   <a-drawer :title="`反馈`" :width="'70vw'"  v-model:visible="orgFankuiVisible" :closable="true"
     :footer-style="{ textAlign: 'right' }" @close="handleOrgFankuiCancel">
diff --git a/src/views/iot/baseIot/CheckBaseIotList.vue b/src/views/iot/baseIot/CheckBaseIotList.vue
index 0d14dba..4203cf1 100644
--- a/src/views/iot/baseIot/CheckBaseIotList.vue
+++ b/src/views/iot/baseIot/CheckBaseIotList.vue
@@ -222,9 +222,3 @@ function searchReset() {
     }
   }
 </style>
-
-<style lang="less">
-.ant-drawer-body {
-      background: url(../resource/img/modalback.png);
-}
-</style>
\ No newline at end of file