From 9efa1fa03a204a573eda576b739b3b7d67495d05 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 27 May 2024 17:57:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=AD=89=E6=AF=94=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 4 +-- src/component/Detail/DesignDetail.vue | 31 ++++++++++++++----- src/component/Detail/DesignDetailAlter.vue | 12 ++++++- src/component/Detail/DesignDetailEnd.vue | 13 +++++--- src/component/Detail/DesignPrintOperation.vue | 6 ++-- .../Detail/DesignPrintOperationMobile.vue | 3 +- src/component/Detail/setDesignItem.vue | 15 ++++----- src/component/Detail/setDesignItemMobile.vue | 15 ++++----- src/lang/cn.ts | 1 + src/lang/en.ts | 1 + src/store/uploadFile/uploadFile.ts | 1 - src/views/HomeView/HomeView.vue | 10 ++++++ src/views/LoginPage.vue | 1 + 13 files changed, 78 insertions(+), 35 deletions(-) diff --git a/.env.dev b/.env.dev index e120d43e..802084fa 100644 --- a/.env.dev +++ b/.env.dev @@ -1,9 +1,9 @@ NODE_ENV = 'development' # VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' -VUE_APP_BASE_URL = 'https://api.aida.com.hk' +# VUE_APP_BASE_URL = 'https://api.aida.com.hk' # VUE_APP_BASE_URL = 'http://18.167.251.121:10086' # VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # VUE_APP_BASE_URL = 'http://192.168.1.9:17088' +VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # VUE_APP_BASE_URL = 'http://192.168.1.9:5567' -# VUE_APP_BASE_URL = 'http://192.168.1.7:5567' diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 4f794cd9..280df86a 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -86,7 +86,7 @@ -
+
{{ $t('DesignDetail.CurrentPrint') }}
@@ -100,7 +100,7 @@
-
+
{{ $t('DesignDetail.CurrentColor') }}
@@ -676,7 +676,7 @@ export default defineComponent({ changed:item.changed?item.changed:false, designType:item.designType?item.designType:"Library", offset:item.layersObject?.[1]?.offset == null?[0,0]:item.layersObject[1].offset, - scale:item.layersObject?.[1]?.scale?item.layersObject[1].scale:1, + scale:item.layersObject?.[1]?.scale?item.layersObject[1].scale:[1,1], printObject:{ ifSingle:item.printObject.ifSingle == null ? false : item.printObject.ifSingle, // path:item.printObject.path?item.printObject.path :'', @@ -850,7 +850,9 @@ export default defineComponent({ }else{ this.deleteShow = false + let designItemDetail = JSON.parse(JSON.stringify(this.designItemDetail)) + let data:any = this.setSubmitItem('preview',true) if(!this.deleteItemShow){ return @@ -861,6 +863,12 @@ export default defineComponent({ designItemDetail.currentFullBodyView = rv.currentFullBodyView designItemDetail.ifSubmit = true this.loadingShow = false + // if(this.designItemDetail.clothes[this.designItemDetail.clothes.legnth-1] && !this.designItemDetail.clothes[this.designItemDetail.clothes.legnth-1].id){ + // this.designItemDetail.clothes.split(this.designItemDetail.clothes.legnth-1,1) + // } + if(data.clothes[data.clothes.legnth-1] && !data.clothes[data.clothes.legnth-1].id){ + data.clothes.split(data.clothes.legnth-1,1) + } this.store.commit("setDesignItemDetail", designItemDetail); this.store.commit("setDesignPreviewData", data); this.setRevocation(designItemDetail,data) @@ -931,6 +939,7 @@ export default defineComponent({ "minIOPath": "", "color": color, gradient:gradient, + priority:10, "printObject": { "ifSingle": null, "prints": [ @@ -944,10 +953,10 @@ export default defineComponent({ // let DesignDetailAlter:any = this.$refs.DesignDetailAlter // DesignDetailAlter.changePlace() this.designOrder = true - if(this.designItemDetail.clothes?.[this.designItemDetail?.clothes.length-1]?.id){ + if(this.designItemDetail.clothes?.[this.designItemDetail?.clothes.length-1]?.id || this.designItemDetail.clothes?.length == 0){ this.designItemDetail.clothes.push(aa) }else{ - + return } this.clothesDetail(aa,this.designItemDetail.clothes.length-1) let DesignDetailAlter:any = this.$refs.DesignDetailAlter @@ -971,8 +980,13 @@ export default defineComponent({ let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) this.designOrder = true - this.current = designItemDetail.clothes[index] - if(this.current.id && !designItemDetail.clothes[designItemDetail.clothes.length-1].id){ + if(clothes){ + this.current = clothes + }else{ + this.current = designItemDetail.clothes[index] + } + if(!this.current) return + if(this.current?.id && !designItemDetail?.clothes[designItemDetail.clothes.length-1].id){ designItemDetail.clothes.splice(designItemDetail.clothes.length-1,1) this.store.commit('setDesignItemDetail',designItemDetail) } @@ -985,6 +999,7 @@ export default defineComponent({ } }); } + this.currentIndex = this.currentIndex>0?this.currentIndex:0 data.designSingleItemDTOList[this.currentIndex] = { color:`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`, @@ -994,7 +1009,7 @@ export default defineComponent({ path:this.current.minIOPath?this.current.minIOPath:'', offset:this.current.layersObject?.[1]?.offset?this.current.layersObject[1].offset:[0,0], priority:this.current.priority, - scale:this.current.layersObject?.[1]?.scale?this.current.layersObject[1].scale:1, + scale:this.current.layersObject?.[1]?.scale?this.current.layersObject[1].scale:[1,1], printObject:{ ifSingle:this.current?.printObject?.ifSingle == null ? false : this.current?.printObject?.ifSingle, // prints:this.current?.printObject[0]?.path == null ? [] : [{ diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 31b53018..c6d65a25 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -566,7 +566,17 @@ export default defineComponent({ init(num){ this.type_ = num this.select = true - let arr = this.current.color + let arr + if(this.current?.color){ + arr = this.current.color + }else{ + arr = { + r: 0, + g: 0, + b: 0, + a:1, + } + } // if(!arr[3]){ // arr[3] = 1 // } diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index cc385ceb..e9fc8c32 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -60,7 +60,7 @@
- +
@@ -84,7 +84,7 @@
-
{{ $t('DesignDetailEnd.preview') }}
+
{{ $t('DesignDetailEnd.preview') }}
{{ $t('DesignDetailEnd.Layout') }}
{{ $t('DesignDetailEnd.preview') }}
@@ -189,7 +189,7 @@ export default defineComponent({ this.type_ = num this.colorList[this.selectIndex] = this.$parent.selectColor this.overallSingle = this.current?.printObject?.ifSingle == null?false:this.current?.printObject?.ifSingle - this.systemDesignerPercentage = this.current?.printObject?.scale?this.current?.printObject?.scale:.3*100 + this.systemDesignerPercentage = this.current?.printObject?.ifSingle?100:this.current?.printObject?.prints[0].scale?this.current?.printObject?.prints[0].scale*100:100 }, //模型 setSketchImg(v){ @@ -304,13 +304,16 @@ export default defineComponent({ } } }) + index = index? index:0 if(!this.current.id){ - data.designSingleItemDTOList[index].priority = zIndex+=1 + if(index){ + data.designSingleItemDTOList[index].priority = zIndex+=1 + } } if(this.type_ == 1){ if(data.designSingleItemDTOList[index].path != this.sketchImg.minIOPath && this.sketchImg.id_){ data.designSingleItemDTOList[index].offset = [0,0] - data.designSingleItemDTOList[index].scale = 1 + data.designSingleItemDTOList[index].scale = [1,1] } data.designSingleItemDTOList = this.soleId(data.designSingleItemDTOList,index) this.sketchImg.id_ = data.designSingleItemDTOList[index].id diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index 9c11166d..a21792d5 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -41,6 +41,7 @@
{{ $t('DesignPrintOperation.Scale') }}
{ if(!this.overallSingle){ - scale = this.systemDesignerPercentage*3/100 + scale = this.systemDesignerPercentage/100 // location = [arr[index].style.left.replace(/px/g,'')*sketchNum+this.print.width.replace(/px/g,'')/2-7,arr[index].style.top.replace(/px/g,'')*sketchNum+this.print.height.replace(/px/g,'')/2-7] location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum] }else{ diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index f9351650..e53922ca 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -41,6 +41,7 @@
Scale
{ if(!this.overallSingle){ - scale = this.systemDesignerPercentage*3/100 + scale = this.systemDesignerPercentage/100 // location = [arr[index].style.left.replace(/px/g,'')*sketchNum+this.print.width.replace(/px/g,'')/2-7,arr[index].style.top.replace(/px/g,'')*sketchNum+this.print.height.replace(/px/g,'')/2-7] location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum] }else{ diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue index 22646bdd..a3c4bb73 100644 --- a/src/component/Detail/setDesignItem.vue +++ b/src/component/Detail/setDesignItem.vue @@ -139,7 +139,6 @@ export default defineComponent({ let front = [] let back = [] let body - designItemDetail.others.forEach((item) => { if(item.type == 'Body'){ body = item @@ -299,7 +298,7 @@ export default defineComponent({ w = (e.x - this.frontBack.front[this.imgDomIndex].centers.left) h = (e.x - this.frontBack.front[this.imgDomIndex].centers.left)*num width = w+'px' - height = w*num+'px' + // height = w*num+'px' }else if(this.direction == 'top'){ num = width/height this.frontBack.front[this.imgDomIndex].style.top = 'auto' @@ -309,19 +308,19 @@ export default defineComponent({ h = (this.frontBack.front[this.imgDomIndex].centers.top - e.y) height = h+'px' - width = h*num+'px' + // width = h*num+'px' }else if(this.direction == 'bottom'){ num = width/height h = (e.y - this.frontBack.front[this.imgDomIndex].centers.top) height = h+'px' - width = h*num+'px' + // width = h*num+'px' }else if(this.direction == 'left'){ this.frontBack.front[this.imgDomIndex].style.left = 'auto' this.frontBack.front[this.imgDomIndex].style.right = parentNode.offsetWidth -imgDomWH.width - this.imgDom.offsetLeft+'px' w = (this.frontBack.front[this.imgDomIndex].centers.left - e.x) width = w+'px' - height = w*num+'px' + // height = w*num+'px' } //判断尺寸是否到边 this.frontBack.front[this.imgDomIndex].style.width = width @@ -409,8 +408,10 @@ export default defineComponent({ if(item.id == arr[index].id && !arr[index].similarity){ let y = ((arr[index]?.style?.top.replace(/px/g,'')*ratio).toFixed(0) - arr[index]?.position[0]) let x = ((arr[index]?.style?.left.replace(/px/g,'')*ratio).toFixed(0) - arr[index]?.position[1]) - let scale = arr[index]?.imageSize?Number(((arr[index]?.style?.width.replace(/px/g,'')*ratio)/(arr[index]?.imageSize[0]/arr[index].scale)).toFixed(2)):1 - item.scale = scale + let scaleWidth = arr[index]?.imageSize?Number(((arr[index]?.style?.width.replace(/px/g,'')*ratio)/(arr[index]?.imageSize[0]/arr[index].scale[0])).toFixed(2)):1 + let scaleHeight = arr[index]?.imageSize?Number(((arr[index]?.style?.height.replace(/px/g,'')*ratio)/(arr[index]?.imageSize[1]/arr[index].scale[1])).toFixed(2)):1 + // let widthScale = (arr[index].style.width.replace(/px/g,'')/arr[index].style.height.replace(/px/g,'')).toFixed(2) + item.scale = [scaleWidth,scaleHeight] let top = y == 0 ? item.offset[1]:y+item.offset[1] let left = x == 0 ? item.offset[0]:x+item.offset[0] item.offset = [left,top] diff --git a/src/component/Detail/setDesignItemMobile.vue b/src/component/Detail/setDesignItemMobile.vue index 28bedc8d..243e8c7f 100644 --- a/src/component/Detail/setDesignItemMobile.vue +++ b/src/component/Detail/setDesignItemMobile.vue @@ -296,7 +296,7 @@ export default defineComponent({ w = (e.changedTouches[0].pageX -imgDomWH.left) h = (e.changedTouches[0].pageX -imgDomWH.left)*num width = w+'px' - height = w*num+'px' + // height = w*num+'px' }else if(this.direction == 'top'){ num = width/height this.frontBack.front[this.imgDomIndex].style.top = 'auto' @@ -307,18 +307,18 @@ export default defineComponent({ h = (this.frontBack.front[this.imgDomIndex].centers.top - e.changedTouches[0].pageY) height = h+'px' - width = h*num+'px' + // width = h*num+'px' }else if(this.direction == 'bottom'){ num = width/height h = (e.changedTouches[0].pageY -imgDomWH.top) height = h+'px' - width = h*num+'px' + // width = h*num+'px' }else if(this.direction == 'left'){ w = (this.frontBack.front[this.imgDomIndex].centers.left - e.changedTouches[0].pageX) this.frontBack.front[this.imgDomIndex].style.left = 'auto' this.frontBack.front[this.imgDomIndex].style.right = this.frontBack.front[this.imgDomIndex].centers.right+'px' width = w+'px' - height = w*num+'px' + // height = w*num+'px' } //判断尺寸是否到边 this.frontBack.front[this.imgDomIndex].style.width = width @@ -403,12 +403,13 @@ export default defineComponent({ imageCategory1 = arr[1].imageCategory } arr.forEach((i)=>{ - let imageCategory = i.imageCategory.split('_')[0] if(item.id == i.id){ let y = ((i?.style?.top.replace(/px/g,'')*ratio).toFixed(0) - i?.position[0]) let x = ((i?.style?.left.replace(/px/g,'')*ratio).toFixed(0) - i?.position[1]) - let scale = i?.imageSize?Number(((i?.style?.width.replace(/px/g,'')*ratio)/(i?.imageSize[0]/i.scale)).toFixed(2)):1 - item.scale = scale + // let scale = i?.imageSize?Number(((i?.style?.width.replace(/px/g,'')*ratio)/(i?.imageSize[0]/i.scale)).toFixed(2)):1 + let scaleWidth = i?.imageSize?Number(((i?.style?.width.replace(/px/g,'')*ratio)/(i?.imageSize[0]/i.scale[0])).toFixed(2)):1 + let scaleHeight = i?.imageSize?Number(((i?.style?.height.replace(/px/g,'')*ratio)/(i?.imageSize[1]/i.scale[1])).toFixed(2)):1 + item.scale = [scaleWidth,scaleHeight] let top = y == 0 ? item.offset[1]:y+item.offset[1] let left = x == 0 ? item.offset[0]:x+item.offset[0] item.offset = [left,top] diff --git a/src/lang/cn.ts b/src/lang/cn.ts index bf82e306..1b1502d5 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -111,6 +111,7 @@ export default { GetStarted:'开始设计', Start:'开始', Edit:'编辑', + Reset:'重置', Design:'设计', Redesign:'重新设计', GeneratedDesign:'生成的设计', diff --git a/src/lang/en.ts b/src/lang/en.ts index 5f0091ed..14b887c3 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -112,6 +112,7 @@ export default { GetStarted:'Get Started', Start:'Start', Edit:'Edit', + Reset:'Reset', Design:'Design', Redesign:'Redesign', GeneratedDesign:'Generated Design', diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts index f86545b2..993e5d8f 100644 --- a/src/store/uploadFile/uploadFile.ts +++ b/src/store/uploadFile/uploadFile.ts @@ -185,7 +185,6 @@ const UploadFilesModule : Module = { state.printboard = [...state.printboardFiles,...state.printGenerateFiles,...state.printMaterialFiles] }, - setColorboardList(state,colorBoards){ state.colorBoards = colorBoards }, diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 50febce2..997efe14 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -33,6 +33,9 @@
{{ $t('HomeView.Edit') }}
+
+ {{ $t('HomeView.Reset') }} +
@@ -556,6 +559,13 @@ export default defineComponent({ collectionModal.recollection(); }, + resetCollection(){ + this.store.commit("clearAllData"); + this.store.commit("clearAllCollection"); + this.store.commit("setAllBoardDataChoose",{}); + this.store.commit("clearShowSketchboard",{}); + + }, //完成设计 finishCollection() { let _this = this; diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index 0ca19b7c..da12ceb9 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -529,6 +529,7 @@ export default defineComponent({ this.store.commit("clearAllData"); this.store.commit("clearAllCollection"); this.store.commit("setAllBoardDataChoose",{}); + this.store.commit("clearShowSketchboard",{}); this.$router.push("/home"); }, //获取当前语言