From 172c9d2e8d25acad21a7d022b50527fd55433884 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 2 Apr 2024 17:45:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=84=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=9D=E5=AD=98=E5=8F=82=E6=95=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/evaluation/evaluationUpload.vue | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/evaluation/evaluationUpload.vue b/src/views/evaluation/evaluationUpload.vue index 063d5012..778c4d00 100644 --- a/src/views/evaluation/evaluationUpload.vue +++ b/src/views/evaluation/evaluationUpload.vue @@ -1172,8 +1172,8 @@ import { message } from "ant-design-vue"; console.log(state.uploadStatus,'state.uploadStatus') await save({ id: state.uploadDownId, - creatId:userInfo.value.userId, - creatName:userInfo.value.realName, + createId:userInfo.value.userId, + createName:userInfo.value.realName, prefix:'', remarks:state.formData.remarks, evaluationName:state.formData.evaluationName, @@ -1289,27 +1289,27 @@ import { message } from "ant-design-vue"; state.uploadDownLoad = false } }) - // await importList(formData).then((res)=>{ - // if(res.code === 200){ - // if(state.stateType == "application/pdf"){ - // state.idValue = res.data.map(item=>item.id) - // state.valueAll = res.data - // }else{ - // state.idValue = res.data.evaluationDetailList.map(item=>item.id) - // state.valueAll = res.data.evaluationDetailList - // state.totalNumber = res.data - // } - // console.log(state.valueAll,'state.valueAll') - // state.uploadDownLoad = false - // } - // }).catch((err)=>{ - // state.uploadDownLoad = false - // console.log(err,'err') - // }) + await importList(formData).then((res)=>{ + if(res.code === 200){ + if(state.stateType == "application/pdf"){ + state.idValue = res.data.map(item=>item.id) + state.valueAll = res.data + }else{ + state.idValue = res.data.evaluationDetailList.map(item=>item.id) + state.valueAll = res.data.evaluationDetailList + state.totalNumber = res.data + } + console.log(state.valueAll,'state.valueAll') + state.uploadDownLoad = false + } + }).catch((err)=>{ + state.uploadDownLoad = false + console.log(err,'err') + }) // try { // const response = await axios.post('/activityApi/evaluation/import', formData); // const jsonData = JSONbig({ storeAsString: true }).parse(response.data); - + // // if (jsonData.code === 200) { // console.log(jsonData.data, 'jsondata.data') // } From 8eb5193c83ba0d6d1c6f15494fd632416045242d Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 2 Apr 2024 17:56:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=84=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=9D=E5=AD=98=E5=8F=82=E6=95=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/evaluation/evaluationUpload.vue | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/evaluation/evaluationUpload.vue b/src/views/evaluation/evaluationUpload.vue index 778c4d00..5b935030 100644 --- a/src/views/evaluation/evaluationUpload.vue +++ b/src/views/evaluation/evaluationUpload.vue @@ -1185,17 +1185,17 @@ import { message } from "ant-design-vue"; console.log(res.data,'data') }) } - //else{ - // state.bg_results = true - // state.valueAll.forEach((item)=>{ - // if(item.createId){ - // item.createId = userInfo.value.userId - // } - // }) - // await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{ - // console.log(res.data,'json') - // }) - // } + else{ + state.bg_results = true + state.valueAll.forEach((item)=>{ + if(item.createId){ + item.createId = userInfo.value.userId + } + }) + await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{ + console.log(res.data,'json') + }) + } of_exit() listData() } From da3fff0e14c7248f26bc077a3a7204a716f0e824 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 2 Apr 2024 17:59:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/evaluation/evaluationUpload.vue | 62 +++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/views/evaluation/evaluationUpload.vue b/src/views/evaluation/evaluationUpload.vue index 5b935030..063d5012 100644 --- a/src/views/evaluation/evaluationUpload.vue +++ b/src/views/evaluation/evaluationUpload.vue @@ -1172,8 +1172,8 @@ import { message } from "ant-design-vue"; console.log(state.uploadStatus,'state.uploadStatus') await save({ id: state.uploadDownId, - createId:userInfo.value.userId, - createName:userInfo.value.realName, + creatId:userInfo.value.userId, + creatName:userInfo.value.realName, prefix:'', remarks:state.formData.remarks, evaluationName:state.formData.evaluationName, @@ -1185,17 +1185,17 @@ import { message } from "ant-design-vue"; console.log(res.data,'data') }) } - else{ - state.bg_results = true - state.valueAll.forEach((item)=>{ - if(item.createId){ - item.createId = userInfo.value.userId - } - }) - await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{ - console.log(res.data,'json') - }) - } + //else{ + // state.bg_results = true + // state.valueAll.forEach((item)=>{ + // if(item.createId){ + // item.createId = userInfo.value.userId + // } + // }) + // await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{ + // console.log(res.data,'json') + // }) + // } of_exit() listData() } @@ -1289,27 +1289,27 @@ import { message } from "ant-design-vue"; state.uploadDownLoad = false } }) - await importList(formData).then((res)=>{ - if(res.code === 200){ - if(state.stateType == "application/pdf"){ - state.idValue = res.data.map(item=>item.id) - state.valueAll = res.data - }else{ - state.idValue = res.data.evaluationDetailList.map(item=>item.id) - state.valueAll = res.data.evaluationDetailList - state.totalNumber = res.data - } - console.log(state.valueAll,'state.valueAll') - state.uploadDownLoad = false - } - }).catch((err)=>{ - state.uploadDownLoad = false - console.log(err,'err') - }) + // await importList(formData).then((res)=>{ + // if(res.code === 200){ + // if(state.stateType == "application/pdf"){ + // state.idValue = res.data.map(item=>item.id) + // state.valueAll = res.data + // }else{ + // state.idValue = res.data.evaluationDetailList.map(item=>item.id) + // state.valueAll = res.data.evaluationDetailList + // state.totalNumber = res.data + // } + // console.log(state.valueAll,'state.valueAll') + // state.uploadDownLoad = false + // } + // }).catch((err)=>{ + // state.uploadDownLoad = false + // console.log(err,'err') + // }) // try { // const response = await axios.post('/activityApi/evaluation/import', formData); // const jsonData = JSONbig({ storeAsString: true }).parse(response.data); - // + // if (jsonData.code === 200) { // console.log(jsonData.data, 'jsondata.data') // }