From 7847b9e8185a6874c5e72eacb198e7501354b31f Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 8 Apr 2024 11:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/evaluation/evaluationUpload.vue | 26 ++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/evaluation/evaluationUpload.vue b/src/views/evaluation/evaluationUpload.vue
index 8a549e87..31464468 100644
--- a/src/views/evaluation/evaluationUpload.vue
+++ b/src/views/evaluation/evaluationUpload.vue
@@ -1133,7 +1133,7 @@ import {timeoutUpload} from "@/api/configPublic";
         state.bg_results = false
       }
       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}`)
         
       }
@@ -1142,12 +1142,12 @@ import {timeoutUpload} from "@/api/configPublic";
           message.error('请输入测评标题名称')
           return
         }
-        if(state.totalNumber.failedEntries&&state.valueAll.length!=0){
-          message.error('请先下载失败数据，并修改后重新上传')
-          state.bg_results = true
-          state.bg_check = false
-          return
-        }
+        // if(state.totalNumber.failedEntries&&state.valueAll.length!=0){
+        //   message.error('请先下载失败数据，并修改后重新上传')
+        //   state.bg_results = true
+        //   state.bg_check = false
+        //   return
+        // }
         state.tableLoading = true
         state.uploadDownLoad = true
         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
                 }else{
                   state.totalNumber.totalEntries = 1
-                  state.totalNumber.failedEntries = 1
-                  state.totalNumber.successfulEntries = 0
+                  state.totalNumber.failedEntries = res.data.failedIds.length
+                  state.totalNumber.successfulEntries = res.data.successIds.length
                 }
                 if(res.data.failedIds.length!=0){
                   message.error('请先下载失败数据，并修改后重新上传')
@@ -1207,15 +1207,15 @@ import {timeoutUpload} from "@/api/configPublic";
             // downloadUrls:state.downloadUrl,
             imagePath:state.formData.cover
           }).then((res)=>{
-            state.uploadDownLoad = false
             if(res.data.failedIds!=null||res.data.successIds!=null){
+              state.uploadDownLoad = false
               if(state.valueAll.length>1){
                 state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.failedIds.length
                 state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.failedIds.length
               }else{
                 state.totalNumber.totalEntries = 1
-                state.totalNumber.failedEntries = 1
-                state.totalNumber.successfulEntries = 0
+                state.totalNumber.failedEntries = res.data.failedIds.length
+                state.totalNumber.successfulEntries = res.data.successIds.length
               }
               if(res.data.failedIds.length!=0){
                 message.error('请先下载失败数据，并修改后重新上传')
@@ -1289,10 +1289,12 @@ import {timeoutUpload} from "@/api/configPublic";
               // state.idValue = res.data.map(item=>item.id)
               state.downloadUrl = res.data.map(item=>item.downloadUrl)
               state.valueAll = res.data
+              state.totalNumber.importTrue = []
             }else{
               // state.idValue = res.data.evaluationDetailList.map(item=>item.id)
               state.downloadUrl = res.data.evaluationDetailList.map(item=>item.downloadUrl)
               state.totalNumber = res.data
+              state.totalNumber.importTrue = res.data.failedIds
               state.valueAll = res.data.evaluationDetailList
             }
             state.uploadDownLoad = false