From 6c81d90cf77aa770d7528e56609858686b79d29f Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 14 Oct 2025 15:57:53 +0800 Subject: [PATCH] =?UTF-8?q?pose=E8=A7=86=E9=A2=91=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=A5=BD=E5=90=8E=E6=B6=88=E5=A4=B1=EF=BC=8Ctoproduct=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=A4=B1=E8=B4=A5=E4=BD=BF=E7=94=A8=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8Clike=E5=90=8Edesign=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=9C=89=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/productImg.vue | 1146 ----------------- .../home/design/editDesignType/index.vue | 4 +- src/component/home/design/index.vue | 68 +- src/component/home/design/tools.vue | 3 +- src/component/home/tools/toProduct/index.vue | 19 +- 5 files changed, 48 insertions(+), 1192 deletions(-) delete mode 100644 src/component/HomePage/productImg.vue diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue deleted file mode 100644 index 9f31e592..00000000 --- a/src/component/HomePage/productImg.vue +++ /dev/null @@ -1,1146 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/component/home/design/editDesignType/index.vue b/src/component/home/design/editDesignType/index.vue index a566c173..0a9deccd 100644 --- a/src/component/home/design/editDesignType/index.vue +++ b/src/component/home/design/editDesignType/index.vue @@ -498,7 +498,7 @@ setup(props:any,{emit}) { clearInterval(remPrductimgTime) store.dispatch('getCredits') }else if(rv[0].status == 'Fail'){ - message.info(t('ProductImg.jsContent3')) + message.info(rv[0]?.errorMessage || t('ProductImg.jsContent3')) isEnd = true productimg.generateCourse = null } @@ -691,7 +691,7 @@ setup(props:any,{emit}) { ...productimg.generateCourse, }] } - emit('upDataDesignLikeList',emitData) + emit('upDataDesignLikeList',emitData,'noBatch') productimg.generateCourse = null } productimg.openType = '' diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue index 198971d5..9ce2afae 100644 --- a/src/component/home/design/index.vue +++ b/src/component/home/design/index.vue @@ -684,11 +684,8 @@ export default defineComponent({ if(str != 'like' && showDesignMark.value) return } let Id = design.userLikeSortId || design.id || design.designItemId - console.log(design) let arr = str == 'like'? posiitonData.value.likeElList:posiitonData.value.generateElList - console.log(arr) let item:any = arr.filter((item:any)=>item.userLikeSortId == Id)[0] - console.log(item) item.el.style.zIndex = 2; item.el.style.transition = 'all 0s'; let startX = e.clientX, @@ -904,7 +901,6 @@ export default defineComponent({ clearInterval(prductimgTime.PoseTransfer) clearInterval(prductimgTime.Relight) arr[index].sort = arr[index].oldSort || arr[index].sort - console.log(JSON.parse(JSON.stringify(arr[index]))) dataDom.editDesignType.init(arr,index,null,status,listType) if(item != 'Design'){ designData.selectDesign = designData.selectLikeDesign.filter((item:any)=>(item.resultType == 'Design' && item.userLikeSortId == designData.selectLikeDesign[index].parentId))[0] @@ -917,7 +913,6 @@ export default defineComponent({ } const addGenerateImg = async (data:any)=>{ if(!data.id)return - console.log(data) await nextTick().then(()=>{ designData.isUnfold = true uploadLikeDom() @@ -927,7 +922,6 @@ export default defineComponent({ const setNoDesignLike = (design:any,index:any,type:any,str:string) => { let url let designItem = design || designData.selectEditBtn - console.log(designItem,designData?.selectDesign) let data = { toProductImageResultId:[(designItem.designItemId || designItem.id)], projectId: store.state.Workspace.probjects.id, @@ -1040,15 +1034,16 @@ export default defineComponent({ if(designData.isUnfold){ designData.selectLikeDesign.forEach((item:any,index:any) => { if(element.taskId == item.taskId){ - designData.selectLikeDesign[index].url = element.url - designData.selectLikeDesign[index].status = element.status - designData.selectLikeDesign[index].elementType = element.elementType - designData.selectLikeDesign[index].elementId = element.elementId - designData.selectLikeDesign[index].id = element.id + designData.selectLikeDesign[index].status = element?.status + designData.selectLikeDesign[index].id = element?.id if(element?.videoUrl){ designData.selectLikeDesign[index].firstFrameUrl = element.firstFrameUrl designData.selectLikeDesign[index].videoUrl = element.videoUrl designData.selectLikeDesign[index].gifUrl = element.gifUrl + }else{ + designData.selectLikeDesign[index].url = element?.url + designData.selectLikeDesign[index].elementType = element?.elementType + designData.selectLikeDesign[index].elementId = element?.elementId } } }); @@ -1057,15 +1052,16 @@ export default defineComponent({ if(likeItem?.childList?.length > 0){ likeItem.childList.forEach((childItem:any,index:any)=>{ if(childItem.taskId == element.taskId){ - likeItem.childList[index].url = element.url - likeItem.childList[index].status = element.status - likeItem.childList[index].elementType = element.elementType - likeItem.childList[index].elementId = element.elementId - likeItem.childList[index].id = element.id + childItem.status = element?.status + childItem.id = element?.id if(element?.videoUrl){ - likeItem.childList[index].id.firstFrameUrl = element.firstFrameUrl - likeItem.childList[index].id.videoUrl = element.videoUrl - likeItem.childList[index].id.gifUrl = element.gifUrl + childItem.firstFrameUrl = element.firstFrameUrl + childItem.videoUrl = element.videoUrl + childItem.gifUrl = element.gifUrl + }else{ + childItem.url = element?.url + childItem.elementId = element?.elementId + childItem.elementType = element?.elementType } } }) @@ -1075,16 +1071,21 @@ export default defineComponent({ setSystemDesigner(0) }) } - const upDataSort = (generateCourseItem:any,likeIndex:number)=>{ + const upDataSort = (generateCourseItem:any,likeIndex:number,str:string)=>{ let list = likeDesignCollectionList.value if(list[likeIndex].childList.length == 0)return list[likeIndex].childList.forEach((likeItem:any,index:any)=>{ - if(likeItem.sort >= generateCourseItem.sort){ + if(likeItem.sort >= generateCourseItem.sort && str == 'noBatch'){ + if(likeItem?.sort)likeItem.oldSort = likeItem.sort + likeItem.sort += 1 + } + if(generateCourseItem.sort >= likeItem.sort && str == 'batch'){ + if(likeItem?.sort)likeItem.oldSort = likeItem.sort likeItem.sort += 1 } }) } - const generateLoad = async (data:any)=>{ + const generateLoad = async (data:any,str:string)=>{ // return let list = likeDesignCollectionList.value //添加元素 @@ -1097,7 +1098,7 @@ export default defineComponent({ generateCourseItem.oldSort = generateCourseItem.sort generateCourseItem.sort = list[index]?.childList.length + 1 if(data.status == 'add'){ - upDataSort(generateCourseItem,index) + upDataSort(generateCourseItem,index,str) list[index]?.childList.push(generateCourseItem) } }else{ @@ -1107,7 +1108,7 @@ export default defineComponent({ list[index].childList = [] } if(data.status == 'add'){ - upDataSort(generateCourseItem,index) + upDataSort(generateCourseItem,index,str) list[index]?.childList.push(generateCourseItem) }else{ upDataSuccess(generateCourseItem) @@ -1170,8 +1171,6 @@ export default defineComponent({ toProductImage.push(childItem.taskId) } }else if(childItem.resultType == 'Relight'){ - console.log(JSON.parse(JSON.stringify(childItem))) - console.log((!childItem.status || childItem.status != "Success"), (!childItem?.url)) if((!childItem.status || childItem.status != "Success") && (!childItem?.url)){ relight.push(childItem.taskId) } @@ -1219,30 +1218,24 @@ export default defineComponent({ prductimgTime[type] = setInterval(()=>{ if(!state)return state = false - Https.axiosPost(url, data).then( - (rv) => { - // if(type == 'PoseTransfer'){ - // rv = [rv] - // } + Https.axiosPost(url, data).then((rv) => { state = true rv.forEach((element:any) => { if(element?.status == 'Success'){ - // setFail([element.taskId]) upDataSuccess(element) data = data.filter((item:any) => item !== element.taskId); store.dispatch('getCredits') }else if(element?.status == 'Fail' || element?.status == 'Invalid'){ data = data.filter((item:any) => item !== element.taskId); setFail([element.taskId]) - message.info(t('Generate.everyTimeEffectPoor')); + message.info(element?.errorMessage || t('Generate.everyTimeEffectPoor')); } }); if(data.length == 0){ - store.state.store.dispatch('getCredits') + store.dispatch('getCredits') clearInterval(prductimgTime[type]) } - } - ).catch(res=>{ + }).catch(res=>{ clearInterval(prductimgTime[type]) setFail(data) }); @@ -1274,7 +1267,6 @@ export default defineComponent({ item.oldSort = item.sort if(item?.childList?.length > 0){ item.childList.forEach((childItem:any,childIndex:number)=>{ - childItem.oldSort = childItem.sort childItem.oldSort = childItem.sort childItem.sort = childItem.sort + childLength + index @@ -1815,7 +1807,6 @@ export default defineComponent({ }, getSkecthBoard(boardData: any) { - console.log(boardData,this.store.state.Workspace.probjects) boardData = boardData || [] const mapB = new Map(); boardData.forEach(item => { @@ -1827,7 +1818,6 @@ export default defineComponent({ boardData.filter(item => item.categoryValue !== undefined && mapB.has(item.categoryValue) ); - console.log(boardData) let sketchBoards = boardData.map((v: any) => { let data = { designType: v.resData.designType, diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue index 65265a96..8bc116ed 100644 --- a/src/component/home/design/tools.vue +++ b/src/component/home/design/tools.vue @@ -221,7 +221,8 @@ export default defineComponent({ addList:generateCourse, deleteList:data.unLikeList, } - emit('editToolsSuccess',emitData) + + emit('editToolsSuccess',emitData,'batch') data.openType = '' data.designTools = false data.unLikeList = [] diff --git a/src/component/home/tools/toProduct/index.vue b/src/component/home/tools/toProduct/index.vue index dc68e72a..4291d6b8 100644 --- a/src/component/home/tools/toProduct/index.vue +++ b/src/component/home/tools/toProduct/index.vue @@ -508,6 +508,8 @@ export default defineComponent({ Https.axiosPost(url, data).then( (rv) => { if(str == 'like'){ + // if(rv?.sort)item.sort = rv.sort + console.log(rv) if(rv?.sort)item.oldSort = rv.sort if(rv?.id)item.userLikeSortId = rv.id item.newLike = true @@ -516,6 +518,7 @@ export default defineComponent({ str:'add', index:-1, } + console.log(value) if(props.productimgMenu.value == 'ToProductImage'){ store.commit("setToProductImage", value); }else{ @@ -658,14 +661,22 @@ export default defineComponent({ if(element.status == 'Success'){ element.imgUrl = element.url let index = productImgData.generateList[props.productimgMenu.value].findIndex((obj:any) => obj.taskId === element.taskId); - productImgData.generateList[props.productimgMenu.value][index] = { - ...element, - modelName:props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value, + console.log(productImgData.generateList[props.productimgMenu.value][index]) + console.log(element) + for (const key in element) { + if(element[key]){ + productImgData.generateList[props.productimgMenu.value][index][key] = element[key] + } } + productImgData.generateList[props.productimgMenu.value][index].modelName = props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value + // productImgData.generateList[props.productimgMenu.value][index] = { + // ...element, + // modelName:props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value, + // } // productImgData.generateList[props.productimgMenu.value].unshift(element) data = data.filter((item:any) => item !== element.taskId); }else if(element.status == 'Fail'){ - message.info(t('ProductImg.jsContent3')) + message.info(element?.errorMessage || t('ProductImg.jsContent3')) let index = productImgData.generateList[props.productimgMenu.value].findIndex((obj:any) => obj.taskId === element.taskId); productImgData.generateList[props.productimgMenu.value].splice(index,1) data = data.filter((item:any) => item !== element.taskId);