From 31a4926f2968082a55d606224efa32eec24ec52e Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 11 Apr 2024 19:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=84=E4=B8=8A=E4=BC=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=8B=E8=BD=BD=E7=A9=BA=E7=99=BD=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/evaluation/evaluationUpload.vue b/src/views/evaluation/evaluationUpload.vue
index a39cf489..80d7e505 100644
--- a/src/views/evaluation/evaluationUpload.vue
+++ b/src/views/evaluation/evaluationUpload.vue
@@ -703,7 +703,7 @@ import {timeoutUpload} from "@/api/configPublic";
       const userInfo = computed(() => store.state.userInfo);
       const router = useRouter();
       const state = reactive({
-        uploadTypes: true,
+        fileLists: [],
         saveNotUpload: true,
         stateUpload: true,
         uploadParameters: {},
@@ -1142,7 +1142,6 @@ import {timeoutUpload} from "@/api/configPublic";
         window.open(`/activityApi/evaluation/download?id=${record.id}`);
       }
       const of_exit = () => {
-        state.uploadTypes = true
         state.bg_check = false;
         state.errorMessage = ''
         state.saveNotUpload = true
@@ -1164,7 +1163,10 @@ import {timeoutUpload} from "@/api/configPublic";
         state.bg_results = false
       }
       const failedDownload = () => {
-        const ids = state.totalNumber.successId+','+state.totalNumber.failedId
+        if(state.totalNumber.successId==''){
+          state.totalNumber.successId = null
+        }
+        const ids = state.totalNumber?.successId||''+(state.totalNumber?.successId==null?'':',')+state.totalNumber?.failedId||''
         window.open(`/activityApi/evaluation/download-failed?ids=${ids}`)
         
       }
@@ -1183,7 +1185,7 @@ import {timeoutUpload} from "@/api/configPublic";
           // 保存上传文件
           await boeRequest('/activityApi/evaluation/detail/saveEvaluationDetail post',{
             id:state.uploadId,
-            successIds:state.sussessIds
+            successIds:state.sussessIds.split(',')
           }).then((res)=>{
             state.uploadDownLoad = false
             state.saveNotUpload = false
@@ -1207,7 +1209,7 @@ import {timeoutUpload} from "@/api/configPublic";
             evaluationName:state.formData.evaluationName,
             workNum: userInfo.value.userNo,
             imagePath:state.formData.cover,
-            successIds:state.saveNotUpload?state.sussessIds:null
+            successIds:state.saveNotUpload?state.sussessIds.split(','):null
           }).then((res)=>{
             if(res.code == 200){
               state.uploadDownLoad = false
@@ -1248,6 +1250,7 @@ import {timeoutUpload} from "@/api/configPublic";
         return false;
       };
       const beforeUpload3 = async (file) => {
+        console.log('bbbbb')
         if(file.type === "application/pdf"){
           const pattern = /^([0-9\u4e00-\u9fa5\a-z\A-Z]+-){2}[0-9\u4e00-\u9fa5\a-z\A-Z]+\.\w*$/;
           if (!pattern.test(file.name)) {
@@ -1313,19 +1316,14 @@ import {timeoutUpload} from "@/api/configPublic";
         //   return false;
         // }
       }
-      watch(()=>state.uploadList.length,()=>{
-        state.uploadTypes = true
-      })
       const handleChange = ({file, fileList,event}) => {
-        if(!state.uploadTypes){
-          return
-        }
+        state.fileLists = fileList
         if(file.response && file.response.code === 200){
             state.totalNumber = file.response.data
-            state.sussessIds = file.response.data.successId.split(',')
+            state.sussessIds = file.response.data?.successId
             state.failedId = file.response.data.failedId
-          state.bg_results = true
-          state.uploadDownLoad = false
+            state.bg_results = true
+            state.uploadDownLoad = false
         }
         if(state.stateUpload){
           state.uploadList = fileList.slice(-1)
@@ -1334,7 +1332,6 @@ import {timeoutUpload} from "@/api/configPublic";
       };
       const uploadRef = ref()
       const delUploadList = (i) => {
-        state.uploadTypes = false
         state.uploadDownLoad = false
         state.sussessIds = null
         state.failedId = ''