From 450beaf8c2d3d5c9eabe95d30e8d97b9e61f8e97 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 16 Apr 2025 13:55:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addAndEditForm.vue | 2 ++ .../coordinatePhotos/upload-record/index.vue | 6 ++-- .../components/addAndEditForm.vue | 16 +++++---- .../importantMatters/upload-record/index.vue | 2 +- .../components/addAndEditForm.vue | 34 ++++++++++--------- .../qualityInspection/upload-record/index.vue | 2 +- .../components/addAndEditForm.vue | 6 ++-- .../safetyMeasure/upload-record/index.vue | 2 +- .../components/addAndEditForm.vue | 26 ++++++-------- .../safetyViolations/upload-record/index.vue | 7 ++-- 10 files changed, 54 insertions(+), 49 deletions(-) diff --git a/src/pages/coordinatePhotos/components/addAndEditForm.vue b/src/pages/coordinatePhotos/components/addAndEditForm.vue index d26be9a..d22af66 100644 --- a/src/pages/coordinatePhotos/components/addAndEditForm.vue +++ b/src/pages/coordinatePhotos/components/addAndEditForm.vue @@ -63,6 +63,8 @@ () => { addAndEditModel.majorName = '' addAndEditModel.majorId = '' + addAndEditModel.gxName = '' + addAndEditModel.gxId = '' } " /> diff --git a/src/pages/coordinatePhotos/upload-record/index.vue b/src/pages/coordinatePhotos/upload-record/index.vue index 07ec29f..fb8972d 100644 --- a/src/pages/coordinatePhotos/upload-record/index.vue +++ b/src/pages/coordinatePhotos/upload-record/index.vue @@ -192,13 +192,13 @@ const getCoordinatePhotoListData = async (isTap = false) => { e.buildUnderImgList = e?.sysFileResourceList.filter((i) => i?.sourceType == 7) e.buildAfterImgList = e?.sysFileResourceList.filter((i) => i?.sourceType == 8) - e.buildBeforeImgList = e.buildBeforeImgList.map((z) => { + e.buildBeforeImgList = e.buildBeforeImgList?.map((z) => { return `${baseURL}/imgTool/files${z.originalFilePath}?token=${token}` }) - e.buildUnderImgList = e.buildUnderImgList.map((x) => { + e.buildUnderImgList = e.buildUnderImgList?.map((x) => { return `${baseURL}/imgTool/files${x.originalFilePath}?token=${token}` }) - e.buildAfterImgList = e.buildAfterImgList.map((y) => { + e.buildAfterImgList = e.buildAfterImgList?.map((y) => { return `${baseURL}/imgTool/files${y.originalFilePath}?token=${token}` }) }) diff --git a/src/pages/importantMatters/components/addAndEditForm.vue b/src/pages/importantMatters/components/addAndEditForm.vue index 7128faa..fc23b29 100644 --- a/src/pages/importantMatters/components/addAndEditForm.vue +++ b/src/pages/importantMatters/components/addAndEditForm.vue @@ -54,6 +54,8 @@ () => { addAndEditModel.majorName = '' addAndEditModel.majorId = '' + addAndEditModel.gxName = '' + addAndEditModel.gxId = '' } " /> @@ -116,7 +118,7 @@ - + @@ -328,6 +326,12 @@ const addAndEditModelRules = ref({ message: '标题不可超过50个字符', trigger: ['blur', 'change'], }, + { + type: 'string', + required: true, + message: '请填写标题', + trigger: ['blur', 'change'], + }, ], content: [ diff --git a/src/pages/importantMatters/upload-record/index.vue b/src/pages/importantMatters/upload-record/index.vue index c743705..fee6e9f 100644 --- a/src/pages/importantMatters/upload-record/index.vue +++ b/src/pages/importantMatters/upload-record/index.vue @@ -128,7 +128,7 @@ const getImportantMattersListData = async (isTap = false) => { } importantMattersList.value.forEach((e) => { - e.fileList = e.sysFileResourceList.map((j) => { + e.fileList = e.sysFileResourceList?.map((j) => { return `${baseURL}/imgTool/files${j.originalFilePath}?token=${token}` }) }) diff --git a/src/pages/qualityInspection/components/addAndEditForm.vue b/src/pages/qualityInspection/components/addAndEditForm.vue index 9b87d2a..7257cfd 100644 --- a/src/pages/qualityInspection/components/addAndEditForm.vue +++ b/src/pages/qualityInspection/components/addAndEditForm.vue @@ -54,6 +54,8 @@ () => { addAndEditModel.majorName = '' addAndEditModel.majorId = '' + addAndEditModel.gxName = '' + addAndEditModel.gxId = '' } " /> @@ -186,7 +188,7 @@ /> - + - + { qualityInspectionList.value.forEach((e) => { e.vioPhotoList = e.vioPhoto?.split(',') - e.vioPhotoList = e.vioPhotoList.map((j) => { + e.vioPhotoList = e.vioPhotoList?.map((j) => { return `${baseURL}/imgTool/files${j}?token=${token}` }) }) diff --git a/src/pages/safetyMeasure/components/addAndEditForm.vue b/src/pages/safetyMeasure/components/addAndEditForm.vue index 0139861..c7a1a82 100644 --- a/src/pages/safetyMeasure/components/addAndEditForm.vue +++ b/src/pages/safetyMeasure/components/addAndEditForm.vue @@ -54,6 +54,8 @@ () => { addAndEditModel.majorName = '' addAndEditModel.majorId = '' + addAndEditModel.gxName = '' + addAndEditModel.gxId = '' } " /> @@ -157,9 +159,7 @@ :deletable="props.addAndEditFormType != 3" :fileList="addAndEditModel.correctionImgList" :maxCount=" - props.addAndEditFormType == 3 - ? addAndEditModel.correctionImgList.length - : 9 - addAndEditModel.correctionImgList.length + props.addAndEditFormType == 3 ? addAndEditModel.correctionImgList.length : 9 " /> diff --git a/src/pages/safetyMeasure/upload-record/index.vue b/src/pages/safetyMeasure/upload-record/index.vue index 9dd702e..e0a3fe6 100644 --- a/src/pages/safetyMeasure/upload-record/index.vue +++ b/src/pages/safetyMeasure/upload-record/index.vue @@ -131,7 +131,7 @@ const getSafetyMeasureListData = async (isTap = false) => { } } safetyMeasureList.value.forEach((e) => { - e.fileList = e.sysFileResourceList.map((j) => { + e.fileList = e.sysFileResourceList?.map((j) => { return `${baseURL}/imgTool/files${j.originalFilePath}?token=${token}` }) }) diff --git a/src/pages/safetyViolations/components/addAndEditForm.vue b/src/pages/safetyViolations/components/addAndEditForm.vue index 99d09c1..c1de7d0 100644 --- a/src/pages/safetyViolations/components/addAndEditForm.vue +++ b/src/pages/safetyViolations/components/addAndEditForm.vue @@ -54,6 +54,8 @@ () => { addAndEditModel.majorName = '' addAndEditModel.majorId = '' + addAndEditModel.gxName = '' + addAndEditModel.gxId = '' } " /> @@ -187,7 +189,7 @@ /> - + - + { // 处理数据 if (isTap) { // 点击搜索时，直接替换数据 - safetyViolationsList.value = res?.data || [] + safetyViolationsList.value = res.data || [] + + console.log(' safetyViolationsList.value', safetyViolationsList.value) // 重置页码 queryParams.value.page = 1 } else { @@ -132,11 +134,12 @@ const getSafetyViolationsListData = async (isTap = false) => { safetyViolationsList.value.forEach((e) => { e.vioPhotoList = e.vioPhoto?.split(',') - e.vioPhotoList = e.vioPhotoList.map((j) => { + e.vioPhotoList = e.vioPhotoList?.map((j) => { return `${baseURL}/imgTool/files${j}?token=${token}` }) }) } catch (error) { + console.log('error', error) // 发生错误时重置数据 if (isTap) { safetyViolationsList.value = []