Merge branch 'liuqiang' into v3

src/api/myfile/myfile.js

@@ -68,6 +68,9 @@ function uploadFileMany(data) {
 		timeout: 10*60*1000,//配置超时时间
         method: "post",
         data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        },
     })
 }
 // 复制

src/views/department/MyFile.vue

@@ -1935,6 +1935,10 @@ export default {
                 ElMessage({ message: '上传文件大小最大为'+maxFileSize.value+'M', type: 'error' })
             return false
             }
+            if(fileArr.value.length>=10){
+                 ElMessage({ message: file.name+'上传失败，单次上传文件数量最多为10个', type: 'error' })
+            return false
+            }
         }
         //获取扫描仪列表
         const scannerFile =async ()=>{

src/views/myfile/MyFile.vue

@@ -2032,13 +2032,18 @@ export default {
             getAllTop()
         }
         const upBefore = (file)=>{
-            console.log('file',file);
+            // console.log('filearr',toRaw(fileArr.value));
+            // console.log('file',file);
             const maxSize = (maxFileSize.value-0)*1024*1024
             // console.log('maxSize',maxSize);
             if(file.size>maxSize){
                 ElMessage({ message: file.name+'上传失败，上传文件大小最大为'+maxFileSize.value+'M', type: 'error' })
             return false
             }
+            if(fileArr.value.length>=10){
+                 ElMessage({ message: file.name+'上传失败，单次上传文件数量最多为10个', type: 'error' })
+            return false
+            }
         }
         //获取扫描仪列表
         const scannerFile =async ()=>{

src/views/publicment/MyFile.vue

@@ -1941,6 +1941,10 @@ export default {
                 ElMessage({ message: '上传文件大小最大为'+maxFileSize.value+'M', type: 'error' })
             return false
             }
+            if(fileArr.value.length>=10){
+                 ElMessage({ message: file.name+'上传失败，单次上传文件数量最多为10个', type: 'error' })
+            return false
+            }
         }
          //获取扫描仪列表
         const scannerFile =async ()=>{

vite.config.js

@@ -39,7 +39,7 @@ export default defineConfig(({
 			proxy: {
 				// https://cn.vitejs.dev/config/#server-proxy
 				'/dev-api': {
-					// target: 'http://192.168.1.28:8080/',
+					// target: 'http://192.168.1.12:8080/',
 					target: 'http://192.168.1.88:8080/',
 					// target: 'http://192.168.1.11:8080/',
 					// target: 'http://localhost:8080/',
@@ -51,7 +51,7 @@ export default defineConfig(({
 				//websocket代理
 				'/websocket': {
 					// target:'ws://localhost:8080/websocket',
-					// target:'ws://192.168.1.28:8080/websocket',
+					// target:'ws://192.168.1.12:8080/websocket',
 					target:'ws://192.168.1.88:8080/websocket',
 					// target:'ws://8.142.173.95:19527/websocket',
 					// target:'ws://192.168.1.11:8080/websocket',