bonus
/
yn_img_tools_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修复

This commit is contained in:
BianLzhaoMin 2025-04-16 13:55:14 +08:00
parent bf5c2aba8b
commit 450beaf8c2
10 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/coordinatePhotos/components/addAndEditForm.vue
View File

@ -63,6 +63,8 @@
() => { () => {
addAndEditModel.majorName = '' addAndEditModel.majorName = ''
addAndEditModel.majorId = '' addAndEditModel.majorId = ''
addAndEditModel.gxName = ''
addAndEditModel.gxId = ''
} }
" "
/> />

6
src/pages/coordinatePhotos/upload-record/index.vue
View File

@ -192,13 +192,13 @@ const getCoordinatePhotoListData = async (isTap = false) => {
e.buildUnderImgList = e?.sysFileResourceList.filter((i) => i?.sourceType == 7) e.buildUnderImgList = e?.sysFileResourceList.filter((i) => i?.sourceType == 7)
e.buildAfterImgList = e?.sysFileResourceList.filter((i) => i?.sourceType == 8) 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}` 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}` 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}` return `${baseURL}/imgTool/files${y.originalFilePath}?token=${token}`
}) })
}) })

16
src/pages/importantMatters/components/addAndEditForm.vue
View File

@ -54,6 +54,8 @@
() => { () => {
addAndEditModel.majorName = '' addAndEditModel.majorName = ''
addAndEditModel.majorId = '' addAndEditModel.majorId = ''
addAndEditModel.gxName = ''
addAndEditModel.gxId = ''
} }
" "
/> />
@ -116,7 +118,7 @@
</template> </template>
</up-input> </up-input>
</up-form-item> </up-form-item>
<up-form-item prop="title" label="标题"> <up-form-item prop="title" label="标题" required>
<up-input <up-input
border="none" border="none"
v-model="addAndEditModel.title" v-model="addAndEditModel.title"
@ -148,11 +150,7 @@
@afterRead="onAfterReadVrImgList" @afterRead="onAfterReadVrImgList"
:fileList="addAndEditModel.imgList" :fileList="addAndEditModel.imgList"
:deletable="props.addAndEditFormType != 3" :deletable="props.addAndEditFormType != 3"
:maxCount=" :maxCount="props.addAndEditFormType == 3 ? addAndEditModel.imgList.length : 9"
props.addAndEditFormType == 3
? addAndEditModel.imgList.length
: 9 - addAndEditModel.imgList.length
"
/> />
</up-form-item> </up-form-item>
@ -328,6 +326,12 @@ const addAndEditModelRules = ref({
message: '标题不可超过50个字符', message: '标题不可超过50个字符',
trigger: ['blur', 'change'], trigger: ['blur', 'change'],
}, },
{
type: 'string',
required: true,
message: '请填写标题',
trigger: ['blur', 'change'],
},
], ],
content: [ content: [

2
src/pages/importantMatters/upload-record/index.vue
View File

@ -128,7 +128,7 @@ const getImportantMattersListData = async (isTap = false) => {
} }
importantMattersList.value.forEach((e) => { importantMattersList.value.forEach((e) => {
e.fileList = e.sysFileResourceList.map((j) => { e.fileList = e.sysFileResourceList?.map((j) => {
return `${baseURL}/imgTool/files${j.originalFilePath}?token=${token}` return `${baseURL}/imgTool/files${j.originalFilePath}?token=${token}`
}) })
}) })

34
src/pages/qualityInspection/components/addAndEditForm.vue
View File

@ -54,6 +54,8 @@
() => { () => {
addAndEditModel.majorName = '' addAndEditModel.majorName = ''
addAndEditModel.majorId = '' addAndEditModel.majorId = ''
addAndEditModel.gxName = ''
addAndEditModel.gxId = ''
} }
" "
/> />
@ -186,7 +188,7 @@
/> />
</up-form-item> </up-form-item>
<TitleTipModal :TitleTip="`整改信息`" /> <TitleTipModal :TitleTip="`整改信息`" />
<up-form-item prop="rectUserName" label="整改人" required> <up-form-item prop="rectUserName" label="整改人">
<up-input <up-input
border="none" border="none"
clearable clearable
@ -221,7 +223,7 @@
</template> </template>
</up-input> </up-input>
</up-form-item> </up-form-item>
<up-form-item prop="rectDesc" label="整改说明" required> <up-form-item prop="rectDesc" label="整改说明">
<up-textarea <up-textarea
count count
autoHeight autoHeight
@ -462,12 +464,12 @@ const addAndEditModelRules = ref({
}, },
], ],
rectUserName: [ rectUserName: [
{ // {
type: 'string', // type: 'string',
required: true, // required: true,
message: '请填写整改人', // message: '请填写整改人',
trigger: ['blur', 'change'], // trigger: ['blur', 'change'],
}, // },
{ {
trigger: ['blur', 'change'], trigger: ['blur', 'change'],
pattern: /^(?:[\u4e00-\u9fa5]{1,10}|[a-zA-Z][a-zA-Z\s\-.]{1,19})$/, pattern: /^(?:[\u4e00-\u9fa5]{1,10}|[a-zA-Z][a-zA-Z\s\-.]{1,19})$/,
@ -478,14 +480,14 @@ const addAndEditModelRules = ref({
message: '请填写正确的人名', message: '请填写正确的人名',
}, },
], ],
rectDesc: [ // rectDesc: [
{ // {
type: 'string', // type: 'string',
required: true, // required: true,
message: '请填写整改说明', // message: '请填写整改说明',
trigger: ['blur', 'change'], // trigger: ['blur', 'change'],
}, // },
], // ],
}) })
// 获取工序 // 获取工序

2
src/pages/qualityInspection/upload-record/index.vue
View File

@ -133,7 +133,7 @@ const getQualityInspectionListData = async (isTap = false) => {
qualityInspectionList.value.forEach((e) => { qualityInspectionList.value.forEach((e) => {
e.vioPhotoList = e.vioPhoto?.split(',') e.vioPhotoList = e.vioPhoto?.split(',')
e.vioPhotoList = e.vioPhotoList.map((j) => { e.vioPhotoList = e.vioPhotoList?.map((j) => {
return `${baseURL}/imgTool/files${j}?token=${token}` return `${baseURL}/imgTool/files${j}?token=${token}`
}) })
}) })

6
src/pages/safetyMeasure/components/addAndEditForm.vue
View File

@ -54,6 +54,8 @@
() => { () => {
addAndEditModel.majorName = '' addAndEditModel.majorName = ''
addAndEditModel.majorId = '' addAndEditModel.majorId = ''
addAndEditModel.gxName = ''
addAndEditModel.gxId = ''
} }
" "
/> />
@ -157,9 +159,7 @@
:deletable="props.addAndEditFormType != 3" :deletable="props.addAndEditFormType != 3"
:fileList="addAndEditModel.correctionImgList" :fileList="addAndEditModel.correctionImgList"
:maxCount=" :maxCount="
props.addAndEditFormType == 3 props.addAndEditFormType == 3 ? addAndEditModel.correctionImgList.length : 9
? addAndEditModel.correctionImgList.length
: 9 - addAndEditModel.correctionImgList.length
" "
/> />
</up-form-item> </up-form-item>

2
src/pages/safetyMeasure/upload-record/index.vue
View File

@ -131,7 +131,7 @@ const getSafetyMeasureListData = async (isTap = false) => {
} }
} }
safetyMeasureList.value.forEach((e) => { safetyMeasureList.value.forEach((e) => {
e.fileList = e.sysFileResourceList.map((j) => { e.fileList = e.sysFileResourceList?.map((j) => {
return `${baseURL}/imgTool/files${j.originalFilePath}?token=${token}` return `${baseURL}/imgTool/files${j.originalFilePath}?token=${token}`
}) })
}) })

26
src/pages/safetyViolations/components/addAndEditForm.vue
View File

@ -54,6 +54,8 @@
() => { () => {
addAndEditModel.majorName = '' addAndEditModel.majorName = ''
addAndEditModel.majorId = '' addAndEditModel.majorId = ''
addAndEditModel.gxName = ''
addAndEditModel.gxId = ''
} }
" "
/> />
@ -187,7 +189,7 @@
/> />
</up-form-item> </up-form-item>
<TitleTipModal :TitleTip="`整改信息`" /> <TitleTipModal :TitleTip="`整改信息`" />
<up-form-item prop="rectUserName" label="整改人" required> <up-form-item prop="rectUserName" label="整改人">
<up-input <up-input
border="none" border="none"
clearable clearable
@ -222,7 +224,7 @@
</template> </template>
</up-input> </up-input>
</up-form-item> </up-form-item>
<up-form-item prop="rectDesc" label="整改说明" required> <up-form-item prop="rectDesc" label="整改说明">
<up-textarea <up-textarea
count count
autoHeight autoHeight
@ -463,12 +465,12 @@ const addAndEditModelRules = ref({
}, },
], ],
rectUserName: [ rectUserName: [
{ // {
type: 'string', // type: 'string',
required: true, // required: true,
message: '请填写整改人', // message: '请填写整改人',
trigger: ['blur', 'change'], // trigger: ['blur', 'change'],
}, // },
{ {
trigger: ['blur', 'change'], trigger: ['blur', 'change'],
pattern: /^(?:[\u4e00-\u9fa5]{1,10}|[a-zA-Z][a-zA-Z\s\-.]{1,19})$/, pattern: /^(?:[\u4e00-\u9fa5]{1,10}|[a-zA-Z][a-zA-Z\s\-.]{1,19})$/,
@ -479,14 +481,6 @@ const addAndEditModelRules = ref({
message: '请填写正确的人名', message: '请填写正确的人名',
}, },
], ],
rectDesc: [
{
type: 'string',
required: true,
message: '请填写整改说明',
trigger: ['blur', 'change'],
},
],
}) })
// 获取工序 // 获取工序

7
src/pages/safetyViolations/upload-record/index.vue
View File

@ -120,7 +120,9 @@ const getSafetyViolationsListData = async (isTap = false) => {
// 处理数据 // 处理数据
if (isTap) { if (isTap) {
// 点击搜索时，直接替换数据 // 点击搜索时，直接替换数据
safetyViolationsList.value = res?.data || [] safetyViolationsList.value = res.data || []
console.log(' safetyViolationsList.value', safetyViolationsList.value)
// 重置页码 // 重置页码
queryParams.value.page = 1 queryParams.value.page = 1
} else { } else {
@ -132,11 +134,12 @@ const getSafetyViolationsListData = async (isTap = false) => {
safetyViolationsList.value.forEach((e) => { safetyViolationsList.value.forEach((e) => {
e.vioPhotoList = e.vioPhoto?.split(',') e.vioPhotoList = e.vioPhoto?.split(',')
e.vioPhotoList = e.vioPhotoList.map((j) => { e.vioPhotoList = e.vioPhotoList?.map((j) => {
return `${baseURL}/imgTool/files${j}?token=${token}` return `${baseURL}/imgTool/files${j}?token=${token}`
}) })
}) })
} catch (error) { } catch (error) {
console.log('error', error)
// 发生错误时重置数据 // 发生错误时重置数据
if (isTap) { if (isTap) {
safetyViolationsList.value = [] safetyViolationsList.value = []