From 7e19cbd787d1879f819ef7f58dbe4c272a46d489 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 3 Apr 2024 15:03:24 +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/api/configPublic.js                   |  3 ++
 src/views/evaluation/evaluationUpload.vue | 45 ++++++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/api/configPublic.js b/src/api/configPublic.js
index 82159f4b..d5345e8e 100644
--- a/src/api/configPublic.js
+++ b/src/api/configPublic.js
@@ -61,3 +61,6 @@ http.interceptors.response.use(
 );
 
 export default http;
+export function timeoutUpload(uploadTime) {
+    http.defaults.timeout = uploadTime;
+}
\ No newline at end of file
diff --git a/src/views/evaluation/evaluationUpload.vue b/src/views/evaluation/evaluationUpload.vue
index 5879303f..07ce3eb4 100644
--- a/src/views/evaluation/evaluationUpload.vue
+++ b/src/views/evaluation/evaluationUpload.vue
@@ -506,7 +506,7 @@
               :columns="columnsAdd"
               :data-source="tableDataAdd"
               :loading="tableLoadingAdd"
-              :scroll="{ x: 'max-content' }"
+              :scroll="{ x: 1000,y: 500 }"
               :pagination="paginationAdd"
             >
               <template #addAuthority="{ record, column }">
@@ -680,6 +680,7 @@ import {
  } from "@/api/evaluation";
 import { useStore } from "vuex";
 import { message } from "ant-design-vue";
+import {timeoutUpload} from "@/api/configPublic";
   export default {
     name: 'evaluationUpload',
     components:{
@@ -991,7 +992,7 @@ import { message } from "ant-design-vue";
           key: "realName",
           className: "h",
           ellipsis: true,
-          width: 100,
+          width: 50,
         },
         {
           title: "工号",
@@ -1020,6 +1021,7 @@ import { message } from "ant-design-vue";
         {
           title: "操作",
           width: "20%",
+          fixed: 'right',
           dataIndex: "id",
           key: "id",
           align: "center",
@@ -1135,6 +1137,7 @@ import { message } from "ant-design-vue";
         
       }
       const reportUpload = async () => {
+        timeoutUpload(1000*60*5)
         if(!state.formData.evaluationName){
           message.error('请输入测评标题名称')
           return
@@ -1158,9 +1161,24 @@ import { message } from "ant-design-vue";
             }
           })
           // 
-          await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{
+          await boeRequest('/activityApi/evaluation/detail/saveEvaluationDetail post',{evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{
             if(res.code == 200){
-              message.success(res.msg)
+              if(res.data.length!=0){
+                // message.success(res.msg)
+                if(state.valueAll.length>1){
+                  state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.length
+                  state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.length
+                }else{
+                  state.totalNumber.totalEntries = 1
+                  state.totalNumber.failedEntries = res.data.length
+                  state.totalNumber.successfulEntries = 0
+                }
+                message.error('请先下载失败数据，并修改后重新上传')
+                state.totalNumber.failedIds = res.data
+                state.bg_results = true
+                state.bg_check = false
+                return
+              }
             }
             if(res.data.code == -1){
               message.error('保存失败')
@@ -1170,7 +1188,7 @@ import { message } from "ant-design-vue";
         }
         if(state.uploadStatus||state.btShow){
           console.log(state.uploadStatus,'state.uploadStatus')
-          await save({
+          await boeRequest('/activityApi/evaluation/save post',{
             id: state.uploadDownId,
             createId:userInfo.value.userId,
             createName:userInfo.value.realName,
@@ -1182,7 +1200,22 @@ import { message } from "ant-design-vue";
             // downloadUrls:state.downloadUrl,
             imagePath:state.formData.cover
           }).then((res)=>{
-            console.log(res.data,'data')
+            if(res.data.length!=0){
+              if(state.valueAll.length>1){
+                state.totalNumber.failedEntries = state.totalNumber.failedEntries + res.data.length
+                state.totalNumber.successfulEntries = state.totalNumber.successfulEntries - res.data.length
+              }else{
+                state.totalNumber.totalEntries = 1
+                state.totalNumber.failedEntries = res.data.length
+                state.totalNumber.successfulEntries = 0
+              }
+              message.error('请先下载失败数据，并修改后重新上传')
+              state.totalNumber.failedIds = res.data
+              state.bg_results = true
+              state.bg_check = false
+              return
+            }
+            console.log(res.data,'save')
           })
         }
         //else{