aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
zhangyh
2025-10-08 09:52:02 +08:00
parent 8c0de4ae55 0fa50cc6ae
commit 3eb24011d2
12 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/component/Detail/DesignDetail.vue
View File

@@ -298,9 +298,10 @@ export default defineComponent({
}
const setClothes = async (list:any)=>{
let clothesList:any = []
await nextTick()
for(let i = 0;i<list.length;i++){
detailData.selectDetail
let {scale,offset,priority,maskUrl,maskMinioUrl} = (detailDom.model as any).getSubmitData(list[i])
let {scale,offset,priority,maskUrl,maskMinioUrl} = await (detailDom.model as any).getSubmitData(list[i],detailData.isUndividedLayerWithSinglePrint)
if(detailDom.canvasBox?.privewDetail)await (detailDom.canvasBox as any).privewDetail()
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
let gradient = null

1
src/component/Detail/detailLeft/module/uploadList.vue
View File

@@ -129,6 +129,7 @@ export default defineComponent({
file.designType = res.data.designType
file.level2Type = type;
file.resData.level2Type = type;
file.minIOPath = file.resData.minIOPath
let fileList = detailData.uploadList.filter(
(v:any) => v.status === "done"

4
src/component/Detail/model/index.vue
View File

@@ -65,8 +65,8 @@ export default defineComponent({
libraryList:null as any,
position:null as any,
})
const getSubmitData = (value:any)=>{
return getDetailListDom.position.getSubmitData(value)
const getSubmitData = (value:any,boolean)=>{
return getDetailListDom.position.getSubmitData(value,boolean)
}
const showDesignImgDetail = (str:any)=>{
new Promise((resolve, reject) => {

5
src/component/Detail/model/modelPosition.vue
View File

@@ -319,9 +319,9 @@ export default defineComponent({
});
return arr
}
const getSubmitData = (value:any)=>{
const getSubmitData = (value:any,isNoComputed)=>{
let parentNode = document.getElementsByClassName('molepositon')[0].getElementsByClassName("designOpenrtion_imgMask")[0].getBoundingClientRect()
if(!detailData.frontBack?.body?.layersObject?.[0]?.imageSize){
if(!detailData.frontBack?.body?.layersObject?.[0]?.imageSize || isNoComputed){
return{
scale:value.layersObject[0].scale,
offset:value.layersObject[0].offset,
@@ -329,7 +329,6 @@ export default defineComponent({
}
}
let ratio = detailData.frontBack.body.layersObject[0].imageSize[0]/parentNode.width
// let arr:any = sort(detailData.frontBack.front)
let arr:any = sort(JSON.parse(JSON.stringify(detailData.frontBack.front)))
let num = 10