diff --git a/src/assets/i18n/langs/cn/quality.js b/src/assets/i18n/langs/cn/quality.js index 4f58f6dc..609725ae 100644 --- a/src/assets/i18n/langs/cn/quality.js +++ b/src/assets/i18n/langs/cn/quality.js @@ -2,11 +2,11 @@ export default { checkPoint: '检查部位', regionName: '区域名称', coding: '编码', - unit:'单位', + unit: '单位', rectificationPeople: '责任人', rectificationWork: '整改单位', - personLiable:'责任人', - personWork:'责任单位', + personLiable: '责任人', + personWork: '责任单位', notifier: '通知人', explain: '说明', operation: '操作', @@ -32,7 +32,7 @@ export default { hint: '提示', confirm: '确定', cancel: '取消', - detail:'详情', + detail: '详情', successfullyDelete: '删除成功', stop: '停', click: '点击', @@ -94,7 +94,7 @@ export default { completed: '已完成', unfinished: '未完成', uploadPictures: '上传图片', - uploadHint: '支持格式jpg,jepg,png，最多上传10张照片', + uploadHint: '支持格式jpg,jepg,png，最多上传5张照片', uploadAttachment: '上传附件', uploadHint2: '只能上传MP3/MP4文件', classification: '排查分类', @@ -150,5 +150,5 @@ export default { { required: true, message: "请选择检查时间", trigger: "change" }, ], }, - failToUpload:'上传失败', + failToUpload: '上传失败', } \ No newline at end of file diff --git a/src/views/projectFront/emergencyDisposal/emergencyPush.vue b/src/views/projectFront/emergencyDisposal/emergencyPush.vue index 06bbd824..d825ea6f 100644 --- a/src/views/projectFront/emergencyDisposal/emergencyPush.vue +++ b/src/views/projectFront/emergencyDisposal/emergencyPush.vue @@ -6,7 +6,7 @@ + v-for="(item, index) in responsibilityList2" :key="index"> @@ -168,6 +168,7 @@ export default { formLabelWidthDetail: "270px", detailData: {}, responsibilityList: [], + responsibilityList2: [], planDate: "", pickerOptions: { disabledDate(time) { @@ -317,7 +318,7 @@ export default { }).then((res) => { if (res.result) { console.log(res.result, 1) - this.responsibilityList = res.result; + this.responsibilityList2 = res.result; } }) }, diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue index e5530299..cd06c3c1 100644 --- a/src/views/projectFront/quality/inspectionLedger.vue +++ b/src/views/projectFront/quality/inspectionLedger.vue @@ -883,8 +883,8 @@ :before-upload="(file) => beforeUpload(file, 1)" name="files" :file-list="fileList1" - :limit="5" > + @@ -1190,12 +1190,14 @@ :on-remove=" (file, fileList) => handleRemove(file, fileList, 3) " + :before-upload="(file) => beforeUpload(file, 1)" :on-preview="(file) => handlePreview(file, 3)" - :limit="5" + :file-list="fileList3" accept="image/jpeg,image/jpg,image/png" name="files" > + {{ $t("message.quality.uploadHint") }} @@ -1873,7 +1875,7 @@
现场照片： - + + @@ -3380,6 +3384,14 @@ export default { }, beforeUpload(file, type) { + if (type == 1 || type == 3 || type == 5) { + // console.log(this.fileList1.length) + if(this.fileList1.length >= 5 || this.fileList3.length >= 5 || this.fileListRectification .length >= 5){ + this.$message.warning("最多只能上传5张图片"); + return false; + } + return true + } if (type == 2 || type == 4) { const fileType = file.type; const fileTypeList = ["audio/mp3", "video/mp4"]; @@ -3399,12 +3411,13 @@ export default { name: file.data[0].filename, url: this.fileUrl + file.data[0].imageUrl, }; - if (this.fileList1.length >= 4) { - this.$message.warning("最多只能上传5张图片"); - return false; - } else { - this.fileList1.push(data); - } + // if (this.fileList1.length >= 5) { + // this.$message.warning("最多只能上传5张图片"); + // return false; + // } else { + + // } + this.fileList1.push(data); } else if (type == 2) { let data = { name: file.data[0].fileInfo.originalFilename, @@ -3417,12 +3430,13 @@ export default { name: file.data[0].filename, url: this.fileUrl + file.data[0].imageUrl, }; - if (this.fileList3.length >= 4) { - this.$message.warning("最多只能上传5张图片"); - return false; - } else { - this.fileList3.push(data); - } + // if (this.fileList3.length >= 4) { + // this.$message.warning("最多只能上传5张图片"); + // return false; + // } else { + + // } + this.fileList3.push(data); } else if (type == 4) { let data = { name: file.data[0].fileInfo.originalFilename, diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index cf28abc1..ac4dc064 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -873,8 +873,9 @@ :before-upload="(file) => beforeUpload(file, 1)" name="files" :file-list="fileList1" - :limit="5" + > + @@ -1177,11 +1178,12 @@ (file, fileList) => handleRemove(file, fileList, 3) " :on-preview="(file) => handlePreview(file, 3)" - :limit="5" + :file-list="fileList3" accept="image/jpeg,image/jpg,image/png" name="files" > + {{ $t("message.quality.uploadHint") }} @@ -1858,7 +1860,7 @@
现场照片： - + handleRemove(file, fileList, 5) " + :before-upload="(file) => beforeUpload(file, 5)" :on-preview="(file) => handlePreview(file, 5)" name="files" :file-list="fileListRectification" accept="image/jpeg,image/jpg,image/png" required - :limit="5" + > + @@ -3339,6 +3343,14 @@ export default { }, beforeUpload(file, type) { + if (type == 1 || type == 3 || type == 5) { + // console.log(this.fileList1.length) + if(this.fileList1.length >= 5 || this.fileList3.length >= 5 || this.fileListRectification .length >= 5){ + this.$message.warning("最多只能上传5张图片"); + return false; + } + return true + } if (type == 2 || type == 4) { const fileType = file.type; const fileTypeList = ["audio/mp3", "video/mp4"]; @@ -3358,12 +3370,13 @@ export default { name: file.data[0].filename, url: this.fileUrl + file.data[0].imageUrl, }; - if (this.fileList1.length >= 4) { - this.$message.warning("最多只能上传5张图片"); - return false; - } else { - this.fileList1.push(data); - } + // if (this.fileList1.length >= 4) { + // this.$message.warning("最多只能上传5张图片"); + // return false; + // } else { + + // } + this.fileList1.push(data); } else if (type == 2) { let data = { name: file.data[0].fileInfo.originalFilename, @@ -3376,12 +3389,13 @@ export default { name: file.data[0].filename, url: this.fileUrl + file.data[0].imageUrl, }; - if (this.fileList3.length >= 4) { - this.$message.warning("最多只能上传5张图片"); - return false; - } else { - this.fileList3.push(data); - } + // if (this.fileList3.length >= 4) { + // this.$message.warning("最多只能上传5张图片"); + // return false; + // } else { + + // } + this.fileList3.push(data); } else if (type == 4) { let data = { name: file.data[0].fileInfo.originalFilename,