Merge branch 'zcwy-zsx0223' into dev0223

This commit is contained in:
zhangsir
2024-04-12 14:14:08 +08:00

View File

@@ -781,9 +781,9 @@ import {timeoutUpload} from "@/api/configPublic";
listData() listData()
}) })
const uploadAdmin = (admin)=>{ const uploadAdmin = (admin)=>{
const aaa = userInfo.value.roleList.map((item)=>item.roleCode) const roleCode = userInfo.value.roleList.map((item)=>item.roleCode)
if (admin){ if (admin){
return aaa.some(t => t == admin) return roleCode.some(t => t == admin)
} }
} }
const trueFalse = (per,i) => { const trueFalse = (per,i) => {
@@ -1157,11 +1157,11 @@ import {timeoutUpload} from "@/api/configPublic";
} }
// 上传结果 // 上传结果
const of_results = () => { const of_results = () => {
state.totalNumber = {}
state.bg_results = false
if(state.totalNumber.failedEntries!=0){ if(state.totalNumber.failedEntries!=0){
delUploadList() delUploadList()
} }
state.totalNumber = {}
state.bg_results = false
} }
const resultsUp = () => { const resultsUp = () => {
of_results() of_results()
@@ -1339,6 +1339,9 @@ import {timeoutUpload} from "@/api/configPublic";
state.failedId = file.response.data.failedId state.failedId = file.response.data.failedId
state.bg_results = true state.bg_results = true
state.uploadDownLoad = false state.uploadDownLoad = false
if(state.totalNumber.failedEntries!=0){
fileList.slice(-1)[0].status = 'error'
}
} }
if(state.stateUpload){ if(state.stateUpload){
state.uploadList = fileList.slice(-1) state.uploadList = fileList.slice(-1)