mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-09 02:46:45 +08:00
Merge branch 'zcwy-0306' into dev0223
This commit is contained in:
@@ -205,6 +205,7 @@
|
||||
:before-upload="beforeUpload3"
|
||||
@change="handleChange"
|
||||
action="/activityApi/evaluation/import"
|
||||
:data="uploadParameters"
|
||||
>
|
||||
<div class="upload_box">
|
||||
<span>选择文件</span>
|
||||
@@ -243,7 +244,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="file_operation" @click="delUploadList(index)" style="color: #4ea6ff">
|
||||
<div class="file_operation" @click="delUploadList(index)" style="color: #4ea6ff;cursor: pointer">
|
||||
删除
|
||||
</div>
|
||||
</div>
|
||||
@@ -701,11 +702,11 @@ import {timeoutUpload} from "@/api/configPublic";
|
||||
const userInfo = computed(() => store.state.userInfo);
|
||||
const router = useRouter();
|
||||
const state = reactive({
|
||||
uploadParameters: {},
|
||||
uploadList: [],
|
||||
isRegularAdministrator: '',
|
||||
loadNewDown:false,
|
||||
totalNumber: {},
|
||||
stateType:'',
|
||||
uploadDownLoad: false,
|
||||
uploadDownId: null,
|
||||
loadData: false,
|
||||
@@ -1293,7 +1294,6 @@ import {timeoutUpload} from "@/api/configPublic";
|
||||
return false;
|
||||
};
|
||||
const beforeUpload3 = async (file) => {
|
||||
state.stateType = file.type
|
||||
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)) {
|
||||
@@ -1311,7 +1311,7 @@ import {timeoutUpload} from "@/api/configPublic";
|
||||
}
|
||||
state.uploadDownLoad = true
|
||||
const formData = {
|
||||
file: file,
|
||||
// file: file,
|
||||
uploadName: userInfo.value.realName,
|
||||
createId: userInfo.value.userId,
|
||||
createName: userInfo.value.realName
|
||||
@@ -1319,6 +1319,7 @@ import {timeoutUpload} from "@/api/configPublic";
|
||||
if(state.uploadId){
|
||||
formData.pid= state.uploadId
|
||||
}
|
||||
state.uploadParameters = formData
|
||||
// 计算文件MD5值
|
||||
// const fileReader = new FileReader();
|
||||
// const calculateMD5 = new Promise((resolve, reject) => {
|
||||
@@ -1356,28 +1357,39 @@ import {timeoutUpload} from "@/api/configPublic";
|
||||
// return false;
|
||||
// }
|
||||
|
||||
boeRequest('/activityApi/evaluation/import post formData',formData).then((res)=>{
|
||||
if(res.code === 200){
|
||||
if(state.stateType == "application/pdf"){
|
||||
// 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
|
||||
console.log(res.data,'res.data')
|
||||
}
|
||||
state.uploadDownLoad = false
|
||||
}
|
||||
})
|
||||
// boeRequest('/activityApi/evaluation/import post formData',formData).then((res)=>{
|
||||
// if(res.code === 200){
|
||||
// if(state.stateType == "application/pdf"){
|
||||
// // 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
|
||||
// }
|
||||
// })
|
||||
// return false
|
||||
}
|
||||
const handleChange = ({file, fileList}) => {
|
||||
file.response && file.response.code === 200 && (file.url = file.response.data)
|
||||
const handleChange = ({file, fileList,event}) => {
|
||||
if(file.response && file.response.code === 200){
|
||||
if(file.type == "application/pdf"){
|
||||
state.downloadUrl = file.response.data.map(item=>item.downloadUrl)
|
||||
state.valueAll = file.response.data
|
||||
state.totalNumber.importTrue = []
|
||||
}else{
|
||||
state.downloadUrl = file.response.data.evaluationDetailList.map(item=>item.downloadUrl)
|
||||
state.totalNumber = file.response.data
|
||||
state.totalNumber.importTrue = file.response.data.failedIds
|
||||
state.valueAll = file.response.data.evaluationDetailList
|
||||
}
|
||||
state.uploadDownLoad = false
|
||||
}
|
||||
state.uploadList = fileList.slice(-1)
|
||||
};
|
||||
const delUploadList = () => {
|
||||
|
||||
Reference in New Issue
Block a user