commit: 一期,修改版本号

src/api/file-upload.ts

@@ -24,12 +24,34 @@ export function handleHttpUpload(options: any) {
     })
 }
 
+// export function handleHttpUploadUrl(options: any, url: string | undefined) {
+//     let formData = new FormData();
+//     formData.append('file', options.file);
+//     formData.append('dir', options.dir)
+//     return new Promise((resolve) => {
+//         try {
+//             request({
+//                 url: url,
+//                 method: 'post',
+//                 headers: {
+//                     'Content-Type': 'multipart/form-data',
+//                 },
+//                 data: formData,
+//             }).then((res: any) => {
+//                 resolve(res.data)
+//             });
+//         } catch (error) {
+//             resolve(error)
+//         }
+//     })
+// }
+
 export function handleHttpUploadUrl(options: any, url: string | undefined) {
     let formData = new FormData();
     formData.append('file', options.file);
-    formData.append('dir', options.dir)
-    return new Promise((resolve) => {
-        try {
+    formData.append('dir', options.dir);
+
+    return new Promise((resolve, reject) => { // 使用 reject 来处理错误
         request({
             url: url,
             method: 'post',
@@ -38,10 +60,16 @@ export function handleHttpUploadUrl(options: any, url: string | undefined) {
             },
             data: formData,
         }).then((res: any) => {
-                resolve(res.data)
-            });
-        } catch (error) {
-            resolve(error)
+            if (res.data && res.data.code !== 0) {
+                // 如果返回的 code 不为 0，拒绝 Promise
+                reject(res.data);
+            } else {
+                // console.log(res.message);
+                resolve(res.message);
             }
-    })
+        }).catch((error) => {
+            // 网络请求遇到其他错误时也拒绝 Promise
+            reject(error);
+        });
+    });
 }

src/components/import-dialog.vue

@@ -62,22 +62,37 @@ const importData = () => {
         return
     }
     uploadRef.value.submit()
-	// emit('error')
 }
 
 function handleUpload(options: any) {
-	handleHttpUploadUrl(options, props.importUrl).then((res: any) => {
-		if (res.code == 0) {
-			ElMessage.success('上传成功')
-			close()
-			emit('success')
-		} else {
-			ElMessage.error(res.msg ? res.msg : "上传失败")
-			emit("error");
+    handleHttpUploadUrl(options, props.importUrl)
+        .then((res: any) => {
+            console.log(res)
+            if (res === 'Request failed with status code 403') {
+                ElMessage.error('上传失败,请检查权限信息')
+                return
             }
+
+            ElMessage.success('上传成功');
+            close();
+            emit('success');
         })
+        .catch((error: any) => {
+            // 处理错误
+            if (error.data && error.data.length > 0) {
+                const errorMessages = error.data
+                    .map(item => `行 ${item.lineNum}: ${item.errors.join(', ')}`)
+                    .join('; ');
+                ElMessage.error(`上传失败: ${errorMessages}`);
+            } else {
+                ElMessage.error(error.msg || '上传失败');
+            }
+            emit("error");
+        });
 }
 
+
+
 </script>
 
 <style lang='scss' scoped></style>

src/stores/remote-ws-store.ts

@@ -3,14 +3,14 @@ import {Session} from "@/utils/storage";
 import {ElMessage} from "element-plus";
 
 // 本地调试版本:
-// const vitalUrl = "ws://" + window.location.host + "/socket.io/admin/rax/vitalSignsMedicine?token=" + Session.getToken()
-// // const medicineUrl = "ws://" + window.location.host + "/socket.io/admin/rax/addMedicine?token=" + Session.getToken()
-// const chatUrl = "ws://" + window.location.host + "/socket.io/admin/rax/chatRoom?token=" + Session.getToken()
+const vitalUrl = "ws://" + window.location.host + "/socket.io/admin/rax/vitalSignsMedicine?token=" + Session.getToken()
+// const medicineUrl = "ws://" + window.location.host + "/socket.io/admin/rax/addMedicine?token=" + Session.getToken()
+const chatUrl = "ws://" + window.location.host + "/socket.io/admin/rax/chatRoom?token=" + Session.getToken()
 
 // 服务器部署版本
-const vitalUrl = "wss://" + window.location.host + "/socket.io/admin/rax/vitalSignsMedicine?token=" + Session.getToken()
-// const medicineUrl = "wss://" + window.location.host + "/socket.io/admin/rax/addMedicine?token=" + Session.getToken()
-const chatUrl = "wss://" + window.location.host + "/socket.io/admin/rax/chatRoom?token=" + Session.getToken()
+// const vitalUrl = "wss://" + window.location.host + "/socket.io/admin/rax/vitalSignsMedicine?token=" + Session.getToken()
+// // const medicineUrl = "wss://" + window.location.host + "/socket.io/admin/rax/addMedicine?token=" + Session.getToken()
+// const chatUrl = "wss://" + window.location.host + "/socket.io/admin/rax/chatRoom?token=" + Session.getToken()
 
 // 测试echars
 // const vitalUrl = "wss://" + "110.41.142.124" + "/socket.io/admin/rax/vitalSignsMedicine?token=" + Session.getToken()