Browse Source

上传功能简易处理

oyq28 2 weeks ago
parent
commit
98137ee279
3 changed files with 22 additions and 13 deletions
  1. 1 1
      pages/work/record/InfoList.uvue
  2. 8 5
      utils/dataProcessor.uts
  3. 13 7
      utils/upload.uts

+ 1 - 1
pages/work/record/InfoList.uvue

@@ -184,7 +184,7 @@
     })
   }
   
-  const upload = (e : any) => {
+  const upload = async (e : any) => {
     console.log("开始上传...")
 	if(productNo.value == null || productNo.value == '') {
 		uni.showToast({

+ 8 - 5
utils/dataProcessor.uts

@@ -338,7 +338,7 @@ export const uploadDataToAPI = async (productCode : string, callback ?: () => vo
 		//暂定需要上传的数据文件
 		//const infoJson = await getLatestRecord(productCode, null);
 		const apiToken = await getTokenFromApi();
-
+        
 		const showProgress = (index : number) => {
 			// 在Android设备上,需要给hideLoading和showLoading之间添加延迟
 			// 先隐藏之前的加载提示
@@ -350,7 +350,7 @@ export const uploadDataToAPI = async (productCode : string, callback ?: () => vo
 					mask: true
 				});
 			}, 50);
-		};
+		}; 
 
 
 		getJoinList('app_media_record as r', 'app_media_info as i', 'r.*,i.productno', 'r.pid=i.pdid', 'i.productno', productCode, null).then((res : UTSJSONObject) => {
@@ -379,20 +379,23 @@ export const uploadDataToAPI = async (productCode : string, callback ?: () => vo
 					upload({
 					  apiUrl: globalConfig.apiUrl,
 					  name: uploadNames[index],
+					  seq: index, 
 					  filePath: filePath,
 					  formData: {
 						   //传递数据
+						   
 					  }
-					})
+					});
 				});
 
 			}
 		})
-	} catch (error) {
+	}
+	catch (error) {
 		console.error(error);
 		uni.showToast({ title: '上传失败,请重试', icon: 'error' });
 		uni.hideLoading();
 		return false;
 	}
-
+	return true;
 }

+ 13 - 7
utils/upload.uts

@@ -52,6 +52,11 @@ let apiUrl:string=globalConfig.apiUrl
   if(cfgMap.has("formData")&&cfg.getJSON("formData")!=null){
   	  formData=cfg.getJSON("formData") as UTSJSONObject
   }
+  let seq:number=0;
+  if(cfgMap.has("seq")&&cfg.getString("seq")!=null&&cfg.getString("seq")!=""){
+  	  seq=cfg.getNumber("seq") as number
+  }
+  
   return new Promise((resolve, reject) => {
 	  const options={
         timeout,
@@ -95,27 +100,28 @@ let apiUrl:string=globalConfig.apiUrl
         },
         fail: (error:UploadFileFail) => {
 		let { errCode,errMsg } = error
+		let seqInfo = '任务'+seq+''
 		switch(errCode){
 			case 5:
-				errMsg='接口超时'
+				errMsg= seqInfo+'接口超时'
 				break
 			case 1000:
-				errMsg='服务端系统错误'
+				errMsg= seqInfo+'服务端系统错误'
 				break
 			case 100001:
-				errMsg='json数据解析错误'
+				errMsg= seqInfo+'json数据解析错误'
 				break
 			case 100002:
-				errMsg="错误信息json解析失败"
+				errMsg= seqInfo+"错误信息json解析失败"
 				break
 			case 600003:
-				errMsg="网络中断"
+				errMsg= seqInfo+"网络中断"
 				break
 			case 600009:
-				errMsg="URL格式不合法"
+				errMsg= seqInfo+"URL格式不合法"
 				break
 			case 602001:
-				errMsg="request系统错误"
+				errMsg= seqInfo+"request系统错误"
 				break
 		}
 		console.log(errMsg)