diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue index c421739..5594376 100644 --- a/src/views/components/TaskForm.vue +++ b/src/views/components/TaskForm.vue @@ -183,15 +183,15 @@ // 获取上传的图片 function getImgList(e) { console.log(e, '11111111111'); + let Num = 0; e.forEach((item) => { item.refField = 'pat_problem'; - AllData.messageTwo = item.status; - console.log(AllData.messageTwo, ' AllData.messageTwo'); - - if (AllData.messageTwo == 'done') { - AllData.isdisabled = false; - } else { - AllData.isdisabled = true; + if (item.status == 'done') { + Num++; + // AllData.isdisabled = false; + if (Num == e.length) { + AllData.isdisabled = false; + } } }); @@ -215,10 +215,10 @@ // 提交上报 const onSubmitData = async () => { console.log(AllData.formData, 'AllData.formData'); - // patrolProblemadd(AllData.formData).then((response) => { - // proxy.showSuccessToast('上报成功'); - // closeDaKa(); - // }); + patrolProblemadd(AllData.formData).then((response) => { + proxy.showSuccessToast('上报成功'); + closeDaKa(); + }); }; // 检查项关闭 diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue index c421739..5594376 100644 --- a/src/views/components/TaskForm.vue +++ b/src/views/components/TaskForm.vue @@ -183,15 +183,15 @@ // 获取上传的图片 function getImgList(e) { console.log(e, '11111111111'); + let Num = 0; e.forEach((item) => { item.refField = 'pat_problem'; - AllData.messageTwo = item.status; - console.log(AllData.messageTwo, ' AllData.messageTwo'); - - if (AllData.messageTwo == 'done') { - AllData.isdisabled = false; - } else { - AllData.isdisabled = true; + if (item.status == 'done') { + Num++; + // AllData.isdisabled = false; + if (Num == e.length) { + AllData.isdisabled = false; + } } }); @@ -215,10 +215,10 @@ // 提交上报 const onSubmitData = async () => { console.log(AllData.formData, 'AllData.formData'); - // patrolProblemadd(AllData.formData).then((response) => { - // proxy.showSuccessToast('上报成功'); - // closeDaKa(); - // }); + patrolProblemadd(AllData.formData).then((response) => { + proxy.showSuccessToast('上报成功'); + closeDaKa(); + }); }; // 检查项关闭 diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue index f64d4be..b930e3d 100644 --- a/src/views/components/uploadFile.vue +++ b/src/views/components/uploadFile.vue @@ -98,7 +98,7 @@ fileArr.map((fileOBJ) => { fileOBJ.status = 'uploading'; fileOBJ.message = '上传中...'; - bus.emit('fileOBJVisible', fileOBJ.message); + // bus.emit('fileOBJVisible', fileOBJ.message); let imgFile = null; if (fileOBJ.file.size / 1024 / 1024 > 500 && fileOBJ.file.type.includes('image')) { blobToBase64(fileOBJ.file, fileOBJ.file.name).then((res) => { @@ -117,7 +117,7 @@ if (res && res.code == 200) { fileOBJ.status = 'done'; fileOBJ.message = '上传成功'; - bus.emit('fileOBJVisible', fileOBJ.message); + // bus.emit('fileOBJVisible', fileOBJ.message); // 业务参数赋值 fileOBJ.url = res.data.url; fileOBJ.fileCloundInfo = res.data; @@ -125,7 +125,7 @@ } else { fileOBJ.status = 'failed'; fileOBJ.message = '上传失败'; - bus.emit('fileOBJVisible', fileOBJ.message); + // bus.emit('fileOBJVisible', fileOBJ.message); } }); });