hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 11:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy-0306' into dev0223

Browse Source
This commit is contained in:
zhangsir
2024-04-08 11:13:26 +08:00
parent e953bd145f b07cc7fd05
commit 0cc289c669
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/views/evaluation/evaluationUpload.vue
View File

@@ -761,6 +761,7 @@ import {timeoutUpload} from "@/api/configPublic";
// { value: 3, label: "已发布" }, // { value: 3, label: "已发布" },
// ]); // ]);
onMounted(()=>{ onMounted(()=>{
timeoutUpload(1000*60*5)
state.tableLoading = true state.tableLoading = true
console.log(userInfo.value,'sssss') console.log(userInfo.value,'sssss')
listData() listData()
@@ -1137,7 +1138,6 @@ import {timeoutUpload} from "@/api/configPublic";
} }
const reportUpload = async () => { const reportUpload = async () => {
timeoutUpload(1000*60*5)
if(!state.formData.evaluationName){ if(!state.formData.evaluationName){
message.error('请输入测评标题名称') message.error('请输入测评标题名称')
return return
@@ -1149,7 +1149,7 @@ import {timeoutUpload} from "@/api/configPublic";
return return
} }
state.tableLoading = true state.tableLoading = true
state.uploadDownLoad = true
if(state.valueAll.length != 0 && !state.loadData&&state.loadNewDown){ if(state.valueAll.length != 0 && !state.loadData&&state.loadNewDown){
if(state.valueAll.length >1){ if(state.valueAll.length >1){
state.bg_results = true state.bg_results = true
@@ -1159,20 +1159,28 @@ import {timeoutUpload} from "@/api/configPublic";
item.createId = userInfo.value.userId item.createId = userInfo.value.userId
} }
}) })
state.totalNumber.failedEntisTrue = state.totalNumber.failedEntries == 0 ? '0' : '1'
// 保存上传文件 // 保存上传文件
await boeRequest('/activityApi/evaluation/detail/saveEvaluationDetail post',{evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{ await boeRequest('/activityApi/evaluation/detail/saveEvaluationDetail post',{
evaluationDetailListlist:state.valueAll,
pid:state.uploadId,
isUpload: state.totalNumber.failedEntisTrue,
}).then((res)=>{
state.uploadDownLoad = false
if(res.code == 200){ if(res.code == 200){
if(res.data.length!=0){ if(res.data.length!=0){
if(state.valueAll.length>1){ if(state.valueAll.length>1){
state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.length state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.failedIds.length
state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.length state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.failedIds.length
}else{ }else{
state.totalNumber.totalEntries = 1 state.totalNumber.totalEntries = 1
state.totalNumber.failedEntries = res.data.length state.totalNumber.failedEntries = 1
state.totalNumber.successfulEntries = 0 state.totalNumber.successfulEntries = 0
} }
message.error('请先下载失败数据，并修改后重新上传') if(res.data.failedIds.length!=0){
state.totalNumber.failedIds = res.data message.error('请先下载失败数据，并修改后重新上传')
}
state.totalNumber.failedIds = [...res.data.failedIds,...res.data.successIds]
state.bg_results = true state.bg_results = true
state.bg_check = false state.bg_check = false
return return
@@ -1184,7 +1192,9 @@ import {timeoutUpload} from "@/api/configPublic";
}) })
} }
if(state.uploadStatus||state.btShow){ if(state.uploadStatus||state.btShow){
state.totalNumber.failedEntisTrue = state.totalNumber.failedEntries == 0 ? '0' : '1'
await boeRequest('/activityApi/evaluation/save post',{ await boeRequest('/activityApi/evaluation/save post',{
isUpload: state.totalNumber.failedEntisTrue,
id: state.uploadDownId, id: state.uploadDownId,
createId:userInfo.value.userId, createId:userInfo.value.userId,
createName:userInfo.value.realName, createName:userInfo.value.realName,
@@ -1197,17 +1207,20 @@ import {timeoutUpload} from "@/api/configPublic";
// downloadUrls:state.downloadUrl, // downloadUrls:state.downloadUrl,
imagePath:state.formData.cover imagePath:state.formData.cover
}).then((res)=>{ }).then((res)=>{
if(res.data.length!=0){ state.uploadDownLoad = false
if(res.data.failedIds!=null||res.data.successIds!=null){
if(state.valueAll.length>1){ if(state.valueAll.length>1){
state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.length state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.failedIds.length
state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.length state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.failedIds.length
}else{ }else{
state.totalNumber.totalEntries = 1 state.totalNumber.totalEntries = 1
state.totalNumber.failedEntries = res.data.length state.totalNumber.failedEntries = 1
state.totalNumber.successfulEntries = 0 state.totalNumber.successfulEntries = 0
} }
message.error('请先下载失败数据，并修改后重新上传') if(res.data.failedIds.length!=0){
state.totalNumber.failedIds = res.data message.error('请先下载失败数据，并修改后重新上传')
}
state.totalNumber.failedIds = [...res.data.failedIds,...res.data.successIds]
state.bg_results = true state.bg_results = true
state.bg_check = false state.bg_check = false
return return