hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 03:16:44 +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:56:29 +08:00
parent 0cc289c669 7847b9e818
commit de7beb70b8
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1133,7 +1133,7 @@ import {timeoutUpload} from "@/api/configPublic";
state.bg_results = false state.bg_results = false
} }
const failedDownload = () => { const failedDownload = () => {
const ids = state.totalNumber.failedIds.join(',') const ids = [...state.totalNumber.failedIds,...state.totalNumber.importTrue].join(',')
window.open(`/activityApi/evaluation/download-failed?ids=${ids}`) window.open(`/activityApi/evaluation/download-failed?ids=${ids}`)
} }
@@ -1142,12 +1142,12 @@ import {timeoutUpload} from "@/api/configPublic";
message.error('请输入测评标题名称') message.error('请输入测评标题名称')
return return
} }
if(state.totalNumber.failedEntries&&state.valueAll.length!=0){ // if(state.totalNumber.failedEntries&&state.valueAll.length!=0){
message.error('请先下载失败数据，并修改后重新上传') // message.error('请先下载失败数据，并修改后重新上传')
state.bg_results = true // state.bg_results = true
state.bg_check = false // state.bg_check = false
return // return
} // }
state.tableLoading = true state.tableLoading = true
state.uploadDownLoad = true state.uploadDownLoad = true
if(state.valueAll.length != 0 && !state.loadData&&state.loadNewDown){ if(state.valueAll.length != 0 && !state.loadData&&state.loadNewDown){
@@ -1174,8 +1174,8 @@ import {timeoutUpload} from "@/api/configPublic";
state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.failedIds.length state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.failedIds.length
}else{ }else{
state.totalNumber.totalEntries = 1 state.totalNumber.totalEntries = 1
state.totalNumber.failedEntries = 1 state.totalNumber.failedEntries = res.data.failedIds.length
state.totalNumber.successfulEntries = 0 state.totalNumber.successfulEntries = res.data.successIds.length
} }
if(res.data.failedIds.length!=0){ if(res.data.failedIds.length!=0){
message.error('请先下载失败数据，并修改后重新上传') message.error('请先下载失败数据，并修改后重新上传')
@@ -1207,15 +1207,15 @@ import {timeoutUpload} from "@/api/configPublic";
// downloadUrls:state.downloadUrl, // downloadUrls:state.downloadUrl,
imagePath:state.formData.cover imagePath:state.formData.cover
}).then((res)=>{ }).then((res)=>{
state.uploadDownLoad = false
if(res.data.failedIds!=null||res.data.successIds!=null){ if(res.data.failedIds!=null||res.data.successIds!=null){
state.uploadDownLoad = false
if(state.valueAll.length>1){ if(state.valueAll.length>1){
state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.failedIds.length state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.failedIds.length
state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.failedIds.length state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.failedIds.length
}else{ }else{
state.totalNumber.totalEntries = 1 state.totalNumber.totalEntries = 1
state.totalNumber.failedEntries = 1 state.totalNumber.failedEntries = res.data.failedIds.length
state.totalNumber.successfulEntries = 0 state.totalNumber.successfulEntries = res.data.successIds.length
} }
if(res.data.failedIds.length!=0){ if(res.data.failedIds.length!=0){
message.error('请先下载失败数据，并修改后重新上传') message.error('请先下载失败数据，并修改后重新上传')
@@ -1289,10 +1289,12 @@ import {timeoutUpload} from "@/api/configPublic";
// state.idValue = res.data.map(item=>item.id) // state.idValue = res.data.map(item=>item.id)
state.downloadUrl = res.data.map(item=>item.downloadUrl) state.downloadUrl = res.data.map(item=>item.downloadUrl)
state.valueAll = res.data state.valueAll = res.data
state.totalNumber.importTrue = []
}else{ }else{
// state.idValue = res.data.evaluationDetailList.map(item=>item.id) // state.idValue = res.data.evaluationDetailList.map(item=>item.id)
state.downloadUrl = res.data.evaluationDetailList.map(item=>item.downloadUrl) state.downloadUrl = res.data.evaluationDetailList.map(item=>item.downloadUrl)
state.totalNumber = res.data state.totalNumber = res.data
state.totalNumber.importTrue = res.data.failedIds
state.valueAll = res.data.evaluationDetailList state.valueAll = res.data.evaluationDetailList
} }
state.uploadDownLoad = false state.uploadDownLoad = false