Merge branch 'zcwy-zsx0223' into dev0223

src/views/evaluation/evaluationUpload.vue

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