From 465f9f8004cb9dec73a9d02619dcfc06a40186fd Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 31 Oct 2025 15:22:43 +0800 Subject: [PATCH] =?UTF-8?q?detail=E6=92=A4=E5=9B=9E=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E7=A7=BB=E5=8A=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=B9=9F=E4=BC=9A=E6=B7=BB=E5=8A=A0=E6=92=A4=E5=9B=9E=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 29 +++++++++++-------- src/component/Detail/model/modelPosition.vue | 10 +++++-- .../home/design/editDesignType/index.vue | 3 +- src/store/Detail/designDetail.ts | 3 ++ 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 2f719645..aa9e202a 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -248,15 +248,13 @@ export default defineComponent({ const setRevocation = ()=>{//设置撤销 let itemDetail = JSON.parse(JSON.stringify(detailData.designDetail)) let revocation:any = JSON.parse((sessionStorage.getItem("revocation") as any)) + if(!revocation)revocation = [] // let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any)) - if(revocation?.[0]?.designItemId != itemDetail.designItemId || revocation?.[0]?.designItemId == undefined){ - // sessionStorage.setItem('revocation', JSON.stringify([])); - // sessionStorage.setItem('oppositeRevocation',JSON.stringify([])); - revocation = [] - } + // if(revocation?.[0]?.designItemId != itemDetail.designItemId || revocation?.[0]?.designItemId == undefined){ + // revocation = [] + // } revocation.push({designData:itemDetail,position:null}) detailData.revocationShow = revocation?.length - detailData.oppositeRevocationShow = 0 sessionStorage.setItem('revocation', JSON.stringify(revocation)); sessionStorage.setItem('oppositeRevocation',JSON.stringify([])); } @@ -265,13 +263,16 @@ export default defineComponent({ const revocation = ()=>{//撤回 let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any)) let revocation = JSON.parse((sessionStorage.getItem("revocation") as any)) - if(detailData.revocationShow <= 1)return + if(revocation.length <= 1)return oppositeRevocation.push(revocation[revocation.length-1]) - detailData.oppositeRevocationShow = oppositeRevocation.length revocation.splice(revocation.length-1,1) detailData.revocationShow = revocation.length // store.commit("DesignDetail/setDesignDetail", revocation[revocation.length-1]); - store.commit('DesignDetail/setDesignDetail',revocation[revocation.length-1]) + if(revocation[revocation.length-1].designData){ + store.commit('DesignDetail/setDesignDetail',revocation[revocation.length-1].designData) + }else{ + store.commit('DesignDetail/setFrontBack',revocation[revocation.length-1].position) + } store.commit('DesignDetail/setDesignColthes',detailData.selectDetail.id) sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation)); sessionStorage.setItem('revocation', JSON.stringify(revocation)); @@ -281,8 +282,13 @@ export default defineComponent({ const oppositeRevocation = ()=>{//反撤回 let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any)) let revocation = JSON.parse((sessionStorage.getItem("revocation") as any)) - if(!oppositeRevocation[oppositeRevocation.length-1])return - store.commit("DesignDetail/setDesignDetail", oppositeRevocation[oppositeRevocation.length-1]); + // if(!oppositeRevocation[oppositeRevocation.length-1].designData)return + if(oppositeRevocation.length < 1)return + if(oppositeRevocation[oppositeRevocation.length-1]?.designData){ + store.commit('DesignDetail/setDesignDetail',oppositeRevocation[oppositeRevocation.length-1].designData) + }else if(oppositeRevocation[oppositeRevocation.length-1]?.position){ + store.commit('DesignDetail/setFrontBack',oppositeRevocation[oppositeRevocation.length-1].position) + } store.commit('DesignDetail/setDesignColthes',detailData.selectDetail.id) revocation.push(oppositeRevocation[oppositeRevocation.length-1]) detailData.revocationShow = revocation.length @@ -363,7 +369,6 @@ export default defineComponent({ } const getSubmitData = async (str:string)=>{ // return - console.log(detailData.selectDetail) let workspace = store.state.Workspace.probjects if(!detailData?.selectDetail?.path && !detailData?.selectDetail?.newDetail?.sketch?.minIOPath)return let clothes:any diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue index 189a44fc..4153bae7 100644 --- a/src/component/Detail/model/modelPosition.vue +++ b/src/component/Detail/model/modelPosition.vue @@ -198,16 +198,21 @@ export default defineComponent({ document.removeEventListener('mouseup',sizeMouseup) document.removeEventListener('touchend',sizeMouseup) //鼠标抬起 - console.log(11) + setRevocation() } + let isMove = false//表示是否移动，是否需要在鼠标抬起的时候保存数据 const setRevocation = ()=>{ + if(!isMove)return + isMove = false let frontBack = JSON.parse(JSON.stringify(detailData.frontBack)) + console.log(frontBack) let revocation:any = JSON.parse((sessionStorage.getItem("revocation") as any)) revocation.push({designData:null,position:frontBack}) sessionStorage.setItem('revocation', JSON.stringify(revocation)); } const sizeMouseMoveOperation = (e:any)=> { + isMove = true let imgDomWH = selectItem.imgDom.getBoundingClientRect() let parentNode =selectItem.imgDom.parentNode let width = imgDomWH.width @@ -262,9 +267,10 @@ export default defineComponent({ document.removeEventListener('mouseup',mouseup) document.removeEventListener('touchend',mouseup) ///鼠标抬起 - console.log(11) + setRevocation() } const mouseMoveOperation = (e:any)=>{ + isMove = true let imgDomWH = selectItem.imgDom.getBoundingClientRect() let parentNode = document.getElementsByClassName('molepositon')[0].getElementsByClassName("designOpenrtion_imgMask")[0].getBoundingClientRect() let x = (e.clientX - detailData.frontBack.front[selectItem.imgDomIndex].centers.left)+'px' diff --git a/src/component/home/design/editDesignType/index.vue b/src/component/home/design/editDesignType/index.vue index 089ccc2c..567b27b3 100644 --- a/src/component/home/design/editDesignType/index.vue +++ b/src/component/home/design/editDesignType/index.vue @@ -423,6 +423,7 @@ setup(props:any,{emit}) { rv.forEach((item:any)=>{ arr.push(item.taskId) }) + console.log(productimg.selectGenerate) productimg.generateCourse = { ...rv[0], prompt:productimg.productimgSearchName, @@ -430,7 +431,6 @@ setup(props:any,{emit}) { // modelName:speed.speedData.value, modelName:data.modelName, poseId:productimg.selectPose, - userLikeSortId:productimg.selectGenerate.userLikeSortId || productimg.selectGenerate?.parentId, sourceUrl:productimg.selectGenerate?.sourceUrl || productimg.selectGenerate?.productImage, status:null, oldId:productimg.openType == 'add'?null:productimg.selectGenerate.id, @@ -590,6 +590,7 @@ setup(props:any,{emit}) { productimg.productimgRelightDirection = '' } let init = async (list:any,index:any,dialogueIndex:any,status:any,listType:string)=>{ + console.log(list[index]) productimg.scaleImageList = list productimg.scaleImageIndex = index scaleImage.value = true diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index d5bfe898..82b9c575 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -153,6 +153,9 @@ const DesignDetail : Module = { state.currentDetailType = data } }, + setFrontBack(state,data){ + state.frontBack = data + }, setDesignColthes(state,data){ if(!state.currentDetailType)state.currentDetailType = 'sketch' //切换选择