From 0ae93da5a6d56cf4e430882b59eb9cd39018e1d0 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 23 Aug 2024 22:23:27 +0800 Subject: [PATCH 1/6] fix --- src/router/index.ts | 29 ++++++++++++++--------------- src/views/Upgrade.vue | 4 ++-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 5c64c305..cd873d31 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -10,8 +10,8 @@ const routes: Array = [ { path: "/", // redirect重定向 - redirect: "/Square" - // redirect: "/upgrade" + // redirect: "/Square" + redirect: "/upgrade" }, { @@ -232,20 +232,20 @@ if (vuex_setSystemUser == 0 || vuex_setSystemUser == 1) { } router.beforeEach((to, from, next) => { + let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问 // 系统维护 - // let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问 - // const toName = to.name === 'upgrade'; - // if(upgradeList.indexOf(to.path) > -1){ - // next(); - // }else{ - // if (toName) { - // next(); - // } else { - // next({ name: 'upgrade' }); - // } - // } - // return + const toName = to.name === 'upgrade'; + if(upgradeList.indexOf(to.path) > -1){ + next(); + }else{ + if (toName) { + next(); + } else { + next({ name: 'upgrade' }); + } + } + return // 检查路由是否存在 // 机房用户 let userInfo = JSON.parse(getCookie("userInfo") as any); @@ -256,7 +256,6 @@ router.beforeEach((to, from, next) => { let routeList = ['/testClickData','/trialApproval']//指定页面需要指定id才能进入 let userIdList = [88,6,46,31,73,83,87,4] let isSystemUserRouteList = ['/login','/Square']//游客用户只能进入这两个页面 - let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问 let systemUser = state.UserHabit.systemUser diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue index baf0ff74..b6b1dc82 100644 --- a/src/views/Upgrade.vue +++ b/src/views/Upgrade.vue @@ -8,10 +8,10 @@
System upgrading
-
Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until further notice. During this period, access to the AiDA system will be temporarily unavailable.
We apologize for any inconvenience this may cause and appreciate your understanding.
+ - +
The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.
From 4385f9f9740f6149fba44cc393418a9db8c453da Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 23 Aug 2024 22:31:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index cd873d31..5c64c305 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -10,8 +10,8 @@ const routes: Array = [ { path: "/", // redirect重定向 - // redirect: "/Square" - redirect: "/upgrade" + redirect: "/Square" + // redirect: "/upgrade" }, { @@ -232,20 +232,20 @@ if (vuex_setSystemUser == 0 || vuex_setSystemUser == 1) { } router.beforeEach((to, from, next) => { - let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问 // 系统维护 - const toName = to.name === 'upgrade'; - if(upgradeList.indexOf(to.path) > -1){ - next(); - }else{ - if (toName) { - next(); - } else { - next({ name: 'upgrade' }); - } - } - return + // let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问 + // const toName = to.name === 'upgrade'; + // if(upgradeList.indexOf(to.path) > -1){ + // next(); + // }else{ + // if (toName) { + // next(); + // } else { + // next({ name: 'upgrade' }); + // } + // } + // return // 检查路由是否存在 // 机房用户 let userInfo = JSON.parse(getCookie("userInfo") as any); @@ -256,6 +256,7 @@ router.beforeEach((to, from, next) => { let routeList = ['/testClickData','/trialApproval']//指定页面需要指定id才能进入 let userIdList = [88,6,46,31,73,83,87,4] let isSystemUserRouteList = ['/login','/Square']//游客用户只能进入这两个页面 + let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问 let systemUser = state.UserHabit.systemUser From ede618402968751abb76026c60e35fda287980f5 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 26 Aug 2024 10:06:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=94=BB=E5=B8=83=E8=A3=81=E5=89=AA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=94=B9=E4=B8=BA=E8=87=AA=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/ExportModel.vue | 58 ++++++++++++++++---------- src/lang/cn.ts | 1 + src/lang/en.ts | 1 + 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 139ab8e3..d9ff6eb6 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -687,32 +687,46 @@ export default defineComponent({ lockRotation: true, }); } - let setExportCanvas = ()=>{ - var objects = canvas.getObjects(); - var maxHeight = 0; - - // 计算所有对象的最大高度 - objects.forEach(function(obj) { - var objBottom = obj.top + obj.height*obj.scaleY; - if (objBottom > maxHeight) { - maxHeight = objBottom; - } - }); - canvasWH.height = maxHeight+30 - // 调整 Canvas 的高度 - canvas.setDimensions({ height: canvasWH.height }); - - // 重新渲染 Canvas + let setExportCanvas = async ()=>{ + await calculateHeight() + canvas.setDimensions({ height: canvasWH.value.height }); canvas.renderAll(); return canvas.toDataURL({ - format: "png", // 导出格式为 PNG - quality: 1, // 图片质量为 1（最高质量） - }); + format: "png", // 导出格式为 PNG + quality: 1, // 图片质量为 1（最高质量） + }); + } + let calculateHeight = ()=>{ + return new Promise((resolve, reject) =>{ + var objects = canvas.getObjects(); + var maxHeight = 0; + Modal.confirm({ + title: useI18.t('exportModel.jsContent8'), + okText: 'Yes', + cancelText: 'No', + mask:false, + centered:true, + onOk() { + objects.forEach(function(obj) { + var objBottom = obj.top + obj.height*obj.scaleY; + if (objBottom > maxHeight) { + maxHeight = objBottom; + } + }); + canvasWH.value.height = Math.round(maxHeight)+30 + + resolve(canvasWH.value.height) + }, + onCancel(){ + resolve(canvasWH.value.height) + } + }); + }) } //设置导出 let setExport = async () => { initAligningGuidelines(canvas,false) - var imageDataURL = setExportCanvas() + var imageDataURL = await setExportCanvas() let a = document.createElement("a"); let img = []; let index = 0; @@ -1829,11 +1843,11 @@ export default defineComponent({ let toSvg = ()=>{ // console.log(canvas.toSvg()); } - let setShare = ()=>{ + let setShare = async ()=>{ initAligningGuidelines(canvas,false) let publishModal = publish.value publishModal.publishMask = true - var imageDataURL = setExportCanvas() + var imageDataURL = await setExportCanvas() let data = { "imgUrl":imageDataURL, userlikeGroupId:userlikeGroupId, diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 95e539d1..f714cfb2 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -71,6 +71,7 @@ export default { jsContent5:'您选择的第{str}张图像在超分辨率增强后的分辨率超过2048。请选择较低的放大倍数。', jsContent6:'请选择需要超分的图片', jsContent7:'保存成功~', + jsContent8:'是否需要自动裁剪画布多余空间', }, upgradePlan:{ BuyCredlts:'购买积分', diff --git a/src/lang/en.ts b/src/lang/en.ts index 3827ae26..f03c56c7 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -72,6 +72,7 @@ export default { jsContent5:'After super-resolution enhancement, the {str} th image you selected has a resolution exceeding 2048, Please choose a lower magnification level.', jsContent6:'Please select the picture that requires upscale', jsContent7:'save successfully', + jsContent8:'Whether you need to automatically crop your canvas excess space', }, upgradePlan:{ BuyCredlts:'Buy credits', From 132826e46b59983c2218b5ecbb874758aa874205 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 30 Aug 2024 11:07:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsingle=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E8=A1=A3=E6=9C=8D=E5=8D=B0=E8=8A=B1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 1 + src/component/Detail/DesignDetailAlter.vue | 36 ++++++++++++---------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index d8fad92d..0f997d21 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -1294,6 +1294,7 @@ export default defineComponent({ // display: block; overflow: initial !important; // width: 100%; + text-align: center; .detail_modal_model{ z-index: 1; position: relative; diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 0451b469..10c17c57 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -20,6 +20,7 @@ {{ $t('DesignDetailAlter.Library') }} + {{designType}}
{ + this.colorList[index+1] = { + gradient:item.gradient, + rgba:item.rgbValue, + tcx:item.tcx, + name:item.name, + } + if(item.gradient){ + this.colorList[index+1].gradient = item.gradient + }else{ + delete this.colorList[index+1].gradient + } + }) } - this.store.state.UploadFilesModule.allBoardData?.colorBoards?.forEach((item,index) => { - this.colorList[index+1] = { - gradient:item.gradient, - rgba:item.rgbValue, - tcx:item.tcx, - name:item.name, - } - if(item.gradient){ - this.colorList[index+1].gradient = item.gradient - }else{ - delete this.colorList[index+1].gradient - } - }) + let DesignDetailEnd = this.$refs.DesignDetailEnd DesignDetailEnd.init(num) this.workspaceCom = computed(()=>{ @@ -774,16 +777,17 @@ export default defineComponent({ //请求我的印花&&模型 getLibraryList(){ let level2Type = '' - if(this.selectCode == 'Sketchboard' || this.selectCode == 'Printboard' || this.selectCode == 'DesignElements'){ + if(this.selectCode == 'Printboard' || this.selectCode == 'DesignElements'){ level2Type = this.designType + }else if(this.selectCode == 'Sketchboard'){ + level2Type = this.current.type } - let type = this.body?this.current.type:level2Type let workspace = this.store.state.Workspace.workspace let data = { // level1Type:'Printboard', level1Type:this.selectCode, // level2Type:'Pattern', - level2Type:type, + level2Type:level2Type, modelSex:workspace?.sex, page:this.currentPage, pictureName:this.searchPictureName, From b22f0495d9aa300aa96fe60367e9aecfbfa39f47 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 2 Sep 2024 11:23:17 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetailAlter.vue | 1 - src/component/Detail/DesignPrintOperation.vue | 102 ++++++++-------- .../Detail/DesignPrintOperationMobile.vue | 110 +++++++++--------- 3 files changed, 114 insertions(+), 99 deletions(-) diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 10c17c57..6bc6c426 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -20,7 +20,6 @@ {{ $t('DesignDetailAlter.Library') }}
- {{designType}}
0?false:this.exhibitionOpenrtionList.single.length>0?true:false + this.ifListOver() if(this.$parent.exhibitionList.print)this.designOpenrtionList = JSON.parse(JSON.stringify(this.$parent.exhibitionList.print)) if(this.$parent.elementsList)this.designList = JSON.parse(JSON.stringify(this.$parent.printsList)) - if(this.overallSingle == false && this.designOpenrtionList.length > 0){ - this.designOpenrtionList[0].checked = true - }else if(this.overallSingle == false && this.designOpenrtionList.length == 0){ - this.setpitch(this.designList[0],0) - } + // if(this.overallSingle == false && this.designOpenrtionList.length > 0){ + // this.designOpenrtionList[0].checked = true + // }else if(this.overallSingle == false && this.designOpenrtionList.length == 0){ + // this.setpitch(this.designList[0],0) + // } let skecth = new Image - skecth.src = this.current.path skecth.onload=()=>{ this.sketch.width = skecth.width/10+'rem' this.sketch.height = skecth.height/10+'rem' skecth.remove() } - if(this.exhibitionOpenrtionList.overall.length > 0 && !this.overallSingle){ + skecth.src = this.current.path + if(this.exhibitionOpenrtionList.overall.length > 0){ let str = 'overall' this.exhibitionOpenrtionList[str].forEach((item,index)=>{ this.setTemplate(item,index,str) + this.designOpenrtionList.forEach((openrtItem)=>{ + if(item.minIOPath == openrtItem.minIOPath)openrtItem.checked=true + }) }) - }else if(!this.overallSingle){ - let str = 'overall' - this.setOverallPosition(0,str) } - if(this.exhibitionOpenrtionList.single.length > 0 && this.overallSingle){ + // else if(!this.overallSingle){ + // let str = 'overall' + // this.setOverallPosition(0,str) + // } + if(this.exhibitionOpenrtionList.single.length > 0){ let str = 'single' this.exhibitionOpenrtionList[str].forEach((item,index)=>{ this.setTemplate(item,index,str) @@ -633,39 +638,44 @@ export default defineComponent({ await this.setPrintWH(item.path) this.designOpenrtionList let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0] - let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth - let scale - scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) - let zIndex = 1 - let left = item.location[0]/sketchNum+'px' - let top = item.location[1]/sketchNum+'px' - if(sketch.offsetWidth < item.location[0]/sketchNum){ - left = sketch.offsetWidth +'px' - } - if(sketch.offsetHeight < item.location[1]/sketchNum){ - top = sketch.offsetHeight +'px' - } - this.systemDesignerPercentage = item.scale?item.scale*100:30 - this.printStyleList[str][index]={ - centers:{ - left:0, - top:0, - }, - style:{ - left:left, - top:top, - right:"auto", - bottom:"auto", - width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', - height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', - zIndex:zIndex++ - }, - transform:{ - // scale:scale<.2?.2:scale,//0.2-3 - rotateZ:item.angle, - }, - designOpenrtionBtn:false + let sketchImg = new Image() + sketchImg.onload = ()=>{ + let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth + let scale + scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) + let zIndex = 1 + let left = item.location[0]/sketchNum+'px' + let top = item.location[1]/sketchNum+'px' + if(sketch.offsetWidth < item.location[0]/sketchNum){ + left = sketch.offsetWidth +'px' + } + if(sketch.offsetHeight < item.location[1]/sketchNum){ + top = sketch.offsetHeight +'px' + } + if(str == 'overall')this.systemDesignerPercentage = item.scale?item.scale*100:30 + this.printStyleList[str][index]={ + centers:{ + left:0, + top:0, + }, + style:{ + left:left, + top:top, + right:"auto", + bottom:"auto", + width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', + height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', + zIndex:zIndex++ + }, + transform:{ + // scale:scale<.2?.2:scale,//0.2-3 + rotateZ:item.angle, + }, + designOpenrtionBtn:false + } + sketchImg.remove() } + sketchImg.src = sketch.src }, setOverallPosition(index,str){ nextTick(()=>{ diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index cf262a3c..a6e03391 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -292,6 +292,7 @@ export default defineComponent({ }, methods: { init(){ + this.designOpenrtion = true let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) this.currentFullBodyView = designItemDetail.currentFullBodyView? designItemDetail.currentFullBodyView:designItemDetail.designItemUrl if(designItemDetail.others.length == 0){ @@ -299,36 +300,40 @@ export default defineComponent({ } //设置前片后片 this.operationCurrent = Object.assign({},this.current) - this.designOpenrtion = true this.clearModal() - this.overallSingle = this.current.printObject.ifSingle?true:false - this.ifListOver() let printList = JSON.parse(JSON.stringify(this.current.printObject.prints)) this.setprintList(printList) + + this.overallSingle = this.exhibitionOpenrtionList.overall.length>0?false:this.exhibitionOpenrtionList.single.length>0?true:false + this.ifListOver() if(this.$parent.exhibitionList.print)this.designOpenrtionList = JSON.parse(JSON.stringify(this.$parent.exhibitionList.print)) if(this.$parent.elementsList)this.designList = JSON.parse(JSON.stringify(this.$parent.printsList)) - if(this.overallSingle == false && this.designOpenrtionList.length > 0){ - this.designOpenrtionList[0].checked = true - }else if(this.overallSingle == false && this.designOpenrtionList.length == 0){ - this.setpitch(this.designList[0],0) - } + // if(this.overallSingle == false && this.designOpenrtionList.length > 0){ + // this.designOpenrtionList[0].checked = true + // }else if(this.overallSingle == false && this.designOpenrtionList.length == 0){ + // this.setpitch(this.designList[0],0) + // } let skecth = new Image - skecth.src = this.current.path skecth.onload=()=>{ this.sketch.width = skecth.width/10+'rem' this.sketch.height = skecth.height/10+'rem' skecth.remove() } - if(this.exhibitionOpenrtionList.overall.length > 0 && !this.overallSingle){ + skecth.src = this.current.path + if(this.exhibitionOpenrtionList.overall.length > 0){ let str = 'overall' this.exhibitionOpenrtionList[str].forEach((item,index)=>{ this.setTemplate(item,index,str) + this.designOpenrtionList.forEach((openrtItem)=>{ + if(item.minIOPath == openrtItem.minIOPath)openrtItem.checked=true + }) }) - }else if(!this.overallSingle){ - let str = 'overall' - this.setOverallPosition(0,str) } - if(this.exhibitionOpenrtionList.single.length > 0 && this.overallSingle){ + // else if(!this.overallSingle){ + // let str = 'overall' + // this.setOverallPosition(0,str) + // } + if(this.exhibitionOpenrtionList.single.length > 0){ let str = 'single' this.exhibitionOpenrtionList[str].forEach((item,index)=>{ this.setTemplate(item,index,str) @@ -366,8 +371,6 @@ export default defineComponent({ }) }, systemDesigner(num) { - let DesignPrintOperationParent = this.$parent - DesignPrintOperationParent.systemDesignerPercentage = num }, formatter(value) { return `${value*3}%`; @@ -430,7 +433,7 @@ export default defineComponent({ location:[0,0], ifSingle:true, }) - this.refetchTemplate(currentIndex,false) + this.refetchTemplate(currentIndex,true) } }, //设置移动 @@ -581,9 +584,6 @@ export default defineComponent({ }, //随机重置图片顺序 refetchTemplate(index,boor) { - // let scale = (Math.trunc(Math.random()*15)+1)*.1 - let rotateZ1 = Math.trunc(Math.random()*360)+1 - let rotateZ2 = Math.trunc(Math.random()*360)+1 let sketch = document.getElementsByClassName("designOpenrtionMobile_modal")[0]?.getElementsByClassName('designOpenrtionMobile_sketch')[0] let width let scale @@ -638,39 +638,44 @@ export default defineComponent({ await this.setPrintWH(item.path) this.designOpenrtionList let sketch = document.getElementsByClassName("designOpenrtionMobile_modal")[0]?.getElementsByClassName('designOpenrtionMobile_sketch')[0] - let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth - let scale - scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) - let zIndex = 1 - let left = item.location[0]/sketchNum+'px' - let top = item.location[1]/sketchNum+'px' - if(sketch.offsetWidth < item.location[0]/sketchNum){ - left = sketch.offsetWidth +'px' - } - if(sketch.offsetHeight < item.location[1]/sketchNum){ - top = sketch.offsetHeight +'px' - } - this.systemDesignerPercentage = item.scale?item.scale*100:30 - this.printStyleList[str][index]={ - centers:{ - left:0, - top:0, - }, - style:{ - left:left, - top:top, - right:"auto", - bottom:"auto", - width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', - height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', - zIndex:zIndex++ - }, - transform:{ - // scale:scale<.2?.2:scale,//0.2-3 - rotateZ:item.angle, - }, - designOpenrtionBtn:false + let sketchImg = new Image() + sketchImg.onload = ()=>{ + let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth + let scale + scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) + let zIndex = 1 + let left = item.location[0]/sketchNum+'px' + let top = item.location[1]/sketchNum+'px' + if(sketch.offsetWidth < item.location[0]/sketchNum){ + left = sketch.offsetWidth +'px' + } + if(sketch.offsetHeight < item.location[1]/sketchNum){ + top = sketch.offsetHeight +'px' + } + if(str == 'overall')this.systemDesignerPercentage = item.scale?item.scale*100:30 + this.printStyleList[str][index]={ + centers:{ + left:0, + top:0, + }, + style:{ + left:left, + top:top, + right:"auto", + bottom:"auto", + width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', + height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', + zIndex:zIndex++ + }, + transform:{ + // scale:scale<.2?.2:scale,//0.2-3 + rotateZ:item.angle, + }, + designOpenrtionBtn:false + } + sketchImg.remove() } + sketchImg.src = sketch.src }, setOverallPosition(index,str){ @@ -813,6 +818,7 @@ export default defineComponent({ designItemDetail.currentFullBodyView = this.designItemDetailTS.rv.currentFullBodyView designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle designItemDetail.clothes[index].layersObject = this.designItemDetailTS.rv.clothes[index].layersObject + designItemDetail.clothes[index].undividedLayer = this.designItemDetailTS.rv.clothes[index].undividedLayer designItemDetail.clothes[index].trims = this.designItemDetailTS.rv.clothes[index].trims designItemDetail.clothes[index].printObject.prints = this.setOkData // designItemDetail.clothes[index].printObject.prints = this.computeZindex() From 1a8af7b0b476e9a0e35b280bdac0a704dcdaa33c Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 2 Sep 2024 12:26:35 +0800 Subject: [PATCH 6/6] fix --- src/component/WorksPage/newScaleImage.vue | 5 ++--- src/component/WorksPage/newScaleImageMobile.vue | 2 -- src/store/uploadFile/uploadFile.ts | 6 ++++++ src/views/HomeView/HomeView.vue | 7 +++---- src/views/HomeView/history.vue | 8 +++++--- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 4868c7b6..58b71c0d 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -400,7 +400,8 @@ export default defineComponent({ if(imgData.scaleImageData.openSource == 0){ return message.info(t('newScaleImage.jsContent2')) } - router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works',isDesign:0}}) + router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works'}}) + store.commit('setChooseIsDesign',false) // router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}}) } let setCommentReply = (value:any,str:any)=>{ @@ -593,8 +594,6 @@ export default defineComponent({ let commentBtn = parent.querySelector('.left_content_item_unfold') let commentDomSon = el.querySelector('div') let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0]) - console.log(commentDomSon.offsetHeight , maxHeight); - if(commentDomSon.offsetHeight > maxHeight){ commentBtn.style.display = 'block' }else if(!binding.value.detailUnfold){ diff --git a/src/component/WorksPage/newScaleImageMobile.vue b/src/component/WorksPage/newScaleImageMobile.vue index 17e5db93..e4b8e31c 100644 --- a/src/component/WorksPage/newScaleImageMobile.vue +++ b/src/component/WorksPage/newScaleImageMobile.vue @@ -568,8 +568,6 @@ export default defineComponent({ let commentBtn = parent.querySelector('.left_content_item_unfold') let commentDomSon = el.querySelector('div') let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0]) - console.log(commentDomSon.offsetHeight , maxHeight); - if(commentDomSon.offsetHeight > maxHeight){ commentBtn.style.display = 'block' }else if(!binding.value.detailUnfold){ diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts index 724ae4e5..e901aee3 100644 --- a/src/store/uploadFile/uploadFile.ts +++ b/src/store/uploadFile/uploadFile.ts @@ -22,6 +22,7 @@ interface UploadFiles{ marketingSketchFiles:any, allBoardData:any, //备份的所有数据，点finish之后备份 moodTemplateId:any, + chooseIsDesign:any, } const UploadFilesModule : Module = { @@ -44,6 +45,7 @@ const UploadFilesModule : Module = { marketingSketchFiles:[], allBoardData:{}, moodTemplateId:'', + chooseIsDesign:{value:true}, }, mutations:{ @@ -206,6 +208,9 @@ const UploadFilesModule : Module = { }, setAllBoardDataChoose(state,data){ state.allBoardData = data + }, + setChooseIsDesign(state,data){ + state.chooseIsDesign.value = data }, clearAllData(state){ state.moodboard = [] @@ -224,6 +229,7 @@ const UploadFilesModule : Module = { state.marketingSketchFiles = [] state.moodTemplateId = '' state.disposeMoodboard = [] + state.chooseIsDesign.value = true // state.showSketchboard = [] }, clearAllId(state){ diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index ce8bd5d1..f053f578 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -336,7 +336,8 @@ export default defineComponent({ let allBoardData:any = computed(()=>{ return store.state.UploadFilesModule.allBoardData}) let isMannequinShow = ref(false) - let chooseIsDesign:any = ref(1) + let chooseIsDesign:any = computed(()=>{ + return store.state.UploadFilesModule.chooseIsDesign}) return { store, likeDesignCollectionList, @@ -473,7 +474,6 @@ export default defineComponent({ // this.store.commit("clearAllCollection"); } if (this.$route.params.id) { - this.chooseIsDesign = this.$route.params.isDesign if(this.$route.params.type == 'History'){ this.getHistoryChoose(this.$route.params.id, "normal"); }else if(this.$route.params.type == 'Works'){ @@ -607,7 +607,6 @@ export default defineComponent({ _this.store.commit("clearAllCollection"); _this.store.commit("setAllBoardDataChoose",{}); _this.store.commit("clearShowSketchboard",{}); - _this.chooseIsDesign = 1; _this.isHaveReviewCollection = false } }); @@ -667,7 +666,7 @@ export default defineComponent({ //设计新的collection designNewCollection() { - if(this.chooseIsDesign == 0){ + if(!this.chooseIsDesign.value){ message.info(this.t('HomeView.jsContent10')); return } diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue index 944a002f..70b9ddd8 100644 --- a/src/views/HomeView/history.vue +++ b/src/views/HomeView/history.vue @@ -349,11 +349,13 @@ export default defineComponent({ }, retrieveHome(record:any){ - let num = 1 + let num = true if(record.original == 0){ - num = 0 + num = false } - this.$router.push({name:'homePage',params: {id:record.id,type:'History',isDesign:num}}) + this.$router.push({name:'homePage',params: {id:record.id,type:'History'}}) + this.store.commit('setChooseIsDesign',num) + }, removeLabel(){ let setLabel:any = this.$refs.setLabel