From 04f33502ac3fb42f1b347f39d6063c5257c89674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Thu, 8 Aug 2024 18:07:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=9A=84=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E6=8C=89=E9=92=AE=E5=A4=8D=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sys/exception/Exception.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/sys/exception/Exception.vue b/src/views/sys/exception/Exception.vue
index eb22c1a2..16580791 100644
--- a/src/views/sys/exception/Exception.vue
+++ b/src/views/sys/exception/Exception.vue
@@ -12,7 +12,7 @@
     <ChartsContianer v-show="!isFullScreen"></ChartsContianer>
 
     <!-- full screen button -->
-    <div class="full-screen-button" :style="{right:isFullScreen?'20px':'590px'}" >
+    <div class="full-screen-button" :style="{right:isFullScreen?'20px':'590px',  zIndex:isFullScreen? 100:1, }" >
       <img v-if="!isFullScreen" @click="fullScreen" src="/public/statistical/full-scrren-button.png" alt="">
       <img v-else @click="exitScreen" src="/public/statistical/full-scrren-button.png" alt="">
     </div>
@@ -328,7 +328,6 @@ function exitScreen() {
     position:absolute;
     bottom:46px;
     right:590px;
-    z-index:1;
     cursor:pointer;
     img{
       width:100%;

From eb1b335e967754a6f661327595e7432416dfb385 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Thu, 8 Aug 2024 18:12:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=90=E5=88=B650M=20?=
 =?UTF-8?q?=E8=B6=85=E6=97=B630=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Upload/src/components/FileUpload.vue       | 18 +++++++++---------
 src/utils/http/axios/index.ts                  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/Upload/src/components/FileUpload.vue b/src/components/Upload/src/components/FileUpload.vue
index f9cddcbe..788d3002 100644
--- a/src/components/Upload/src/components/FileUpload.vue
+++ b/src/components/Upload/src/components/FileUpload.vue
@@ -188,15 +188,15 @@
       // 防止弹出多个错误提示
       setTimeout(() => (isActMsg.value = true), 1000);
     }
-    // const isLt = file.size / 1024 / 1024 > maxSize;
-    // if (isLt) {
-    //   createMessage.error(t('component.upload.maxSizeMultiple', [maxSize]));
-    //   isLtMsg.value = false;
-    //   // 防止弹出多个错误提示
-    //   setTimeout(() => (isLtMsg.value = true), 1000);
-    // }
-    // return (isAct && !isLt) || Upload.LIST_IGNORE;
-    return isAct || Upload.LIST_IGNORE;
+    const isLt = file.size / 1024 / 1024 > 50;
+    if (isLt) {
+      createMessage.error(t('component.upload.maxSizeMultiple', [50]));
+      isLtMsg.value = false;
+      // 防止弹出多个错误提示
+      setTimeout(() => (isLtMsg.value = true), 1000);
+    }
+    return (isAct && !isLt) || Upload.LIST_IGNORE;
+    // return isAct || Upload.LIST_IGNORE;
   };
 
   async function customRequest(info: UploadRequestOption<any>) {
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 825bad95..ec4c9a92 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -233,7 +233,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authentication schemes，e.g: Bearer
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
-        timeout: 10 * 1000,
+        timeout: 30 * 1000,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
 

From 78342c3a8fa7c468bcc1ac3863ee4536a43e2a0d Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Thu, 8 Aug 2024 18:24:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/index.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue
index def7216e..44a3edd4 100644
--- a/src/components/FormViewer/index.vue
+++ b/src/components/FormViewer/index.vue
@@ -427,15 +427,17 @@
       }
       console.log(subTableDataStore.getGroupData);
       let resultObj = {}
-      tabsFormRef.value.forEach((item,index) => {
-        console.log(item.getFieldsValue(),index)
-        let data = item.getFieldsValue()
-        Object.keys(data).forEach(key => {
-          if(!resultObj[key]){
-            resultObj[key] = data[key]
-          }
+      if(tabsFormRef.value){
+        tabsFormRef.value.forEach((item,index) => {
+          console.log(item.getFieldsValue(),index)
+          let data = item.getFieldsValue()
+          Object.keys(data).forEach(key => {
+            if(!resultObj[key]){
+              resultObj[key] = data[key]
+            }
+          })
         })
-      })
+      }
       //卡片组的值赋值给form，优化卡片组必填验证不通过
       setFieldsValue({
         ...resultObj,