From 7189164f1cca525953bb986ce649340c3787d525 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 21 May 2024 17:28:57 +0800 Subject: [PATCH 01/13] fix --- src/component/HomePage/TaskPage.vue | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue index 58c7a2bc..62bd2cfc 100644 --- a/src/component/HomePage/TaskPage.vue +++ b/src/component/HomePage/TaskPage.vue @@ -134,7 +134,7 @@ export default defineComponent({ function callback(entries:any, observer:any) { entries.forEach((entry:any) => { if (entry.isIntersecting) { - this_.getTaskMoreList() + this_.getTaskMoreList('') } else { } }); @@ -154,12 +154,12 @@ export default defineComponent({ // this.getTaskList() let time = 100 if(data){ - time = 1000 + time = 10000 } setTimeout(() => { this.currentPage = 1 this.isShowMark = true - this.getTaskMoreList() + this.getTaskMoreList(data) this.getTaskTime = null }, time); }, @@ -182,7 +182,7 @@ export default defineComponent({ this.currentPage = 1 this.total = 0 this.taskListMore = [] - this.getTaskMoreList() + this.getTaskMoreList('') }, getTaskList(){ clearTimeout(this.getTaskTime) @@ -226,7 +226,7 @@ export default defineComponent({ } }) }, - getTaskMoreList(){ + getTaskMoreList(value:any){ let data = { size:this.pageSize, page: this.currentPage, @@ -238,12 +238,20 @@ export default defineComponent({ this.isShowMark = false if(this.currentPage != 1 && rv.content.length == 0){ this.currentPage = 1 - this.getTaskMoreList() + this.getTaskMoreList('') }else{ this.currentPage += 1 this.taskListMore.push(...rv.content) this.total = rv.total this.taskListUnfinished = [] + rv.content.forEach((item:any) => { + value.forEach((valueItem:any) => { + if(valueItem == item.taskId && item.status == 'success'){ + downloadIamge(item.outputImage,item.imageName) + this.store.dispatch('getCredits') + } + }); + }); this.taskListMore.forEach((item:any,index:number)=>{ if(item.status == 'Waiting' || item.status == 'Executing'){ item.index = index @@ -260,7 +268,6 @@ export default defineComponent({ }); }, setDownloadIamge(item:any){ - console.log(item); downloadIamge(item.outputImage,item.imageName) } From 498f69137a59c5066ee226a9a4d6ff83ae4001a6 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 May 2024 10:44:48 +0800 Subject: [PATCH 02/13] fix --- src/component/HomePage/Generate.vue | 2 +- src/component/HomePage/PrintboardUpload.vue | 2 +- src/component/HomePage/SketchboardUpload.vue | 2 +- src/views/HomeView/library.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 3f02ac48..0fecd3a0 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -645,7 +645,7 @@ export default defineComponent({ this.inputTime = setTimeout(()=>{ // let num1 = ((input as HTMLInputElement).value.match(/ /g) || []).length // let num2 = (input as HTMLInputElement).value.split(' ').length - if(this.searchPictureName?.split(/\s+/).length > 75){ + if(this.searchPictureName?.split(/\s+/).length > 250){ (this.$refs.inputShowText as any).innerHTML = this.t('Generate.maximumLength') this.inputShow = true }else{ diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 864e8715..33f263d2 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -663,7 +663,7 @@ export default defineComponent({ }, ifMaximumLength(){ this.inputTime = setTimeout(()=>{ - if(this.captionGeneration?.split(/\s+/).length > 75){ + if(this.captionGeneration?.split(/\s+/).length > 250){ (this.$refs.inputShowText as any).innerHTML = this.t('PrintboardUpload.maximumLength') this.inputShow = true }else{ diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index 69095350..a25a3ab3 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -517,7 +517,7 @@ export default defineComponent({ // let num1 = ((input as HTMLInputElement).value.match(/ /g) || []).length // let num2 = (input as HTMLInputElement).value.split(' ').length - if(this.captionGeneration?.split(/\s+/).length > 75){ + if(this.captionGeneration?.split(/\s+/).length > 250){ (this.$refs.inputShowText as any).innerHTML = this.t('SketchboardUpload.maximumLength') this.inputShow = true }else{ diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index a779dcec..fc4836dc 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -1037,7 +1037,7 @@ export default defineComponent({ ifMaximumLength(){ clearTimeout(this.inputTime) this.inputTime = setTimeout(()=>{ - if(this.captionGeneration?.split(/\s+/).length > 75){ + if(this.captionGeneration?.split(/\s+/).length > 250){ (this.$refs.inputShowText as any).innerHTML = this.t('LibraryPage.maximumLength') this.inputShow = true }else{ From 74ad98f515389baaccaf4399c49870a3ce9905ec Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 May 2024 11:05:17 +0800 Subject: [PATCH 03/13] fix --- src/component/Administrator/allUser.vue | 1 - src/component/Detail/DesignDetail.vue | 3 ++- src/component/Detail/setDesignItem2.vue | 1 - src/component/HomePage/Material.vue | 2 -- src/component/WorksPage/publish.vue | 1 - src/views/HomeView/Works.vue | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index 9bca8ca1..2e3def18 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -141,7 +141,6 @@ export default defineComponent({ //获取列表 gettrialList() { Https.axiosGet(Https.httpUrls.inquiryGetTrial).then((rv)=>{ - console.log(rv); this.dataList = rv }) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 327fe1e6..4f794cd9 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -1195,7 +1195,8 @@ export default defineComponent({ position: relative; width: auto; max-height: 100%; - + max-width: 100%; + object-fit: contain; top: 50%; transform: translateY(-50%); } diff --git a/src/component/Detail/setDesignItem2.vue b/src/component/Detail/setDesignItem2.vue index 18c4fe2c..2924d878 100644 --- a/src/component/Detail/setDesignItem2.vue +++ b/src/component/Detail/setDesignItem2.vue @@ -151,7 +151,6 @@ export default defineComponent({ } let fontBackMove = [] canvas.on('selection:created', (e)=> { - console.log(3213123123); // console.log(canvas.getActiveObject()); // // if() // console.log(frontBack.front.find(person => person.id === canvas.getActiveObject().id)); diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue index c1834ca8..ccdc6e8b 100644 --- a/src/component/HomePage/Material.vue +++ b/src/component/HomePage/Material.vue @@ -248,8 +248,6 @@ export default defineComponent({ }, selectImgItem(imgData:any){ - console.log(imgData); - let parent:any = this.$parent if(parent.isUseGenerate){ this.setUseGenerate([]) diff --git a/src/component/WorksPage/publish.vue b/src/component/WorksPage/publish.vue index 90fcef17..f7a5bc60 100644 --- a/src/component/WorksPage/publish.vue +++ b/src/component/WorksPage/publish.vue @@ -99,7 +99,6 @@ export default defineComponent({ // document.execCommand("copy"); // } let init = ()=>{ - console.log(213123); publish.value = true // publishDate.publishList = list // publishDate.publishIndex = index diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue index 89f9b4ea..ca3a2cf8 100644 --- a/src/views/HomeView/Works.vue +++ b/src/views/HomeView/Works.vue @@ -201,7 +201,6 @@ export default defineComponent({ let likeFile = (item:any,type:string) => { } let getImgScale = (index:any)=>{ - console.log(newScaleImage.value); newScaleImage.value.scaleImageMask = true newScaleImage.value.init(filter.worksList,index) } From 9c587130201fecf1e29f50b791fcd178047be885 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 May 2024 11:40:49 +0800 Subject: [PATCH 04/13] fix --- src/component/Detail/habit.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 12115505..53cf7ab0 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -255,6 +255,8 @@ export default defineComponent({ this.openType.model = false // this.getDetail(this.workspaceItem.id) this.store.commit("setWorkspace", this.workspaceItem); + }else{ + this.getworkspace() } } }, From 48210a11f3dfac7f3e93c1e18d952ecacdc715ce Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 May 2024 14:08:50 +0800 Subject: [PATCH 05/13] fix --- .env.dev | 1 + src/component/Detail/habit.vue | 81 ++++++++++++++++++---------------- src/views/HomeView/library.vue | 22 ++++++++- 3 files changed, 65 insertions(+), 39 deletions(-) diff --git a/.env.dev b/.env.dev index b6e5858c..98ab4c2c 100644 --- a/.env.dev +++ b/.env.dev @@ -5,4 +5,5 @@ 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.9:5567' # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 53cf7ab0..68de8701 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -268,20 +268,20 @@ export default defineComponent({ } } }, - 'workspaceItem.id_':{ + 'workspace.id':{ handler(newVal:any,oldVal:any){ - this.workspace.workspaceList.forEach((v:any)=>{ - if(v.id == this.workspaceItem.id_){ - this.workspaceItem = v - this.workspaceItem.id_ = v.id - } - if(v.id == oldVal){ - delete v.isLastIndex - this.putWorkspace(v,newVal) - this.getDetail(newVal) - } - }) - this.getMannequins() + // this.workspace.workspaceList.forEach((v:any)=>{ + // if(v.id == this.workspaceItem.id_){ + // this.workspaceItem = v + // this.workspaceItem.id_ = v.id + // } + // if(v.id == oldVal){ + // delete v.isLastIndex + // this.putWorkspace(v,newVal) + // this.getDetail(newVal) + // } + // }) + this.getDetail(newVal) } }, 'openType.workspace':{ @@ -341,7 +341,7 @@ export default defineComponent({ // new Promise((resolve) => { // this.getPosition(resolve) // }) - await this.getPosition() + await this.getPosition()//获取衣服类型 this.getworkspace() this.getSex() }, @@ -469,27 +469,17 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.workspaceList,data).then((rv: any) => { if (rv) { - rv.page.content.forEach((v:any) => { - v.id_ = v.id - if(v.position == "Overall"){ - v.overallSingle = false - }else{ - v.overallSingle = true - } - v.putName = false - if(v.id == (this.workspaceItem.id == -1 ?rv.id:this.workspaceItem.id)){ - this.workspaceItem = v - this.setMannequinsSex() - this.setPosition('') - } - }); - this.total = rv.page.total + // rv.page.content.forEach((v:any) => { + // v.id_ = v.id + // if(v.position == "Overall"){ + // v.overallSingle = false + // }else{ + // v.overallSingle = true + // } + // v.putName = false + // }); this.workspace.id = rv.id - // if(this.workspace.workspaceList){ - // this.workspace.workspaceList.push(...rv.page.content) - // }else{ - // this.workspace.workspaceList = rv.page.content - // } + this.total = rv.page.total this.workspace.workspaceList = rv.page.content } }) @@ -497,6 +487,15 @@ export default defineComponent({ getDetail(id:any){// Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => { if (rv) { + if(rv.position == "Overall"){ + rv.overallSingle = false + }else{ + rv.overallSingle = true + } + rv.putName = false + this.workspaceItem = rv + this.setMannequinsSex() + this.setPosition('') // this.getworkspace() } }) @@ -524,12 +523,16 @@ export default defineComponent({ if(this.workspaceItem.id == -1){ return } + this.openType.model = false Https.axiosPost(Https.httpUrls.workspacesaveOrUpdate,data).then((rv: any) => { if (rv) { if(index){ // this.getDetail(index) }else{ - this.getworkspace() + } + this.getworkspace() + if(index){ + this.getDetail(index) } this.workspace.workspaceList[index].workSpaceName = this.workspaceItemName this.workspace.workspaceList[index].putName = false @@ -597,6 +600,7 @@ export default defineComponent({ message.info(this.t('Habit.jsContent2')); }else{ if(index == -1){ + let data = { workSpaceName:this.workspaceItemName, } @@ -610,7 +614,7 @@ export default defineComponent({ } }) data.workSpaceName = this.workspaceItemName - this.putWorkspace(data,'') + this.putWorkspace(data,this.workspaceItem.id) } } @@ -632,8 +636,9 @@ export default defineComponent({ this.workspace.workspaceList.forEach((v:any) => { v.putName = false }); - - this.workspaceItem.id_ = num + this.putWorkspace(this.workspaceItem,'') + this.workspace.id = num + // this.workspaceItem.id_ = num this.openType.workspace = false }, //新建参数 diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index fc4836dc..8ad06ce6 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -864,7 +864,27 @@ export default defineComponent({ centered:true, onOk() { data.deleteModelConfirm = 1 - + let id = _this.store.state.Workspace.workspace.id + Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => { + if (rv) { + if(rv.position == "Overall"){ + rv.overallSingle = false + }else{ + rv.overallSingle = true + } + if(rv.sexEnum.name == 'Female'){ + rv.mannequinUrl = rv.femalePresignedUrl + rv.mannequinType = rv.mannequinFemaleType + rv.mannequinId = rv.mannequinFemaleId + }else if(rv.sexEnum.name == 'Male'){ + rv.mannequinUrl = rv.malePresignedUrl + rv.mannequinType = rv.mannequinMaleType + rv.mannequinId = rv.mannequinMaleId + } + + _this.store.commit("setWorkspace", rv); + } + }) _this.confirmDeletePic(data,index) }, onCancel(){ From a889523f6a950aaf86b299816dba2c78c112d866 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 May 2024 14:17:01 +0800 Subject: [PATCH 06/13] fix --- .env.dev | 2 +- src/component/Detail/habit.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.dev b/.env.dev index 98ab4c2c..e120d43e 100644 --- a/.env.dev +++ b/.env.dev @@ -5,5 +5,5 @@ 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.9: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/habit.vue b/src/component/Detail/habit.vue index 68de8701..23da2c60 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -253,6 +253,7 @@ export default defineComponent({ delete data.isLastIndex this.putWorkspace(data,'') this.openType.model = false + this.getDetail(this.workspaceItem.id) // this.getDetail(this.workspaceItem.id) this.store.commit("setWorkspace", this.workspaceItem); }else{ From 7eb695029d3a4dae137d5aa12de518031c19f1da Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 May 2024 14:54:37 +0800 Subject: [PATCH 07/13] fix --- src/component/Detail/habit.vue | 8 ++++---- src/store/workspace/workspace.ts | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 23da2c60..51e03c77 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -251,9 +251,8 @@ export default defineComponent({ } let data = this.workspaceItem delete data.isLastIndex - this.putWorkspace(data,'') + this.putWorkspace(data,this.workspaceItem.id) this.openType.model = false - this.getDetail(this.workspaceItem.id) // this.getDetail(this.workspaceItem.id) this.store.commit("setWorkspace", this.workspaceItem); }else{ @@ -531,16 +530,17 @@ export default defineComponent({ // this.getDetail(index) }else{ } - this.getworkspace() if(index){ this.getDetail(index) + }else{ + this.getworkspace() } this.workspace.workspaceList[index].workSpaceName = this.workspaceItemName this.workspace.workspaceList[index].putName = false this.openType.addWorkspace = false } }).catch((res)=>{ - this.getworkspace() + // this.getworkspace() }); }, deleteWorkspace(data:any){ diff --git a/src/store/workspace/workspace.ts b/src/store/workspace/workspace.ts index 2dfff126..b019133c 100644 --- a/src/store/workspace/workspace.ts +++ b/src/store/workspace/workspace.ts @@ -16,6 +16,8 @@ const Workspace : Module = { }, mutations:{ setWorkspace(state,files){ + console.log(files); + state.workspace = files }, setWorkspaceSex(state,files){ From f98ea231288c87c868e6a15a0b8d5e7697d954cd Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 May 2024 14:55:31 +0800 Subject: [PATCH 08/13] fix --- src/store/workspace/workspace.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/store/workspace/workspace.ts b/src/store/workspace/workspace.ts index b019133c..2dfff126 100644 --- a/src/store/workspace/workspace.ts +++ b/src/store/workspace/workspace.ts @@ -16,8 +16,6 @@ const Workspace : Module = { }, mutations:{ setWorkspace(state,files){ - console.log(files); - state.workspace = files }, setWorkspaceSex(state,files){ From d45aadfeb2b5a7b8f9f2ef94be42461cc1622fbe Mon Sep 17 00:00:00 2001 From: WangXiaoDong <1627315083@qq.com> Date: Wed, 22 May 2024 23:13:55 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=ADipad?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tool/util.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tool/util.js b/src/tool/util.js index 3eacdc46..876aa2c9 100644 --- a/src/tool/util.js +++ b/src/tool/util.js @@ -149,7 +149,7 @@ const formatTime = (timestamp, fmt) => {//吧时间戳转为YYYY-MM-DD hh:mm:ss const isMoible = () => {//判断是否是移动端 let is_mobile = navigator.userAgent.toLowerCase().match(/(ipad|ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null; // alert(navigator.userAgent.toLowerCase()) - var isiPad = (navigator.maxTouchPoints && navigator.maxTouchPoints > 0); + var isiPad = (navigator.maxTouchPoints && navigator.maxTouchPoints > 1); // if (is_mobile) { // return true//判断是否在正则内 // } else if(window.matchMedia("(pointer:fine)").matches){ @@ -160,7 +160,7 @@ const isMoible = () => {//判断是否是移动端 if (is_mobile) { return true//判断是否在正则内 } else{ - isiPad//判断触摸点 + return isiPad//判断触摸点 } } From a5cfaeafe5e366eb05332d9f4d3f04e8bb0e4e0a Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 23 May 2024 09:30:20 +0800 Subject: [PATCH 10/13] fix --- src/component/Detail/habit.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 51e03c77..0cc378d1 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -256,7 +256,7 @@ export default defineComponent({ // this.getDetail(this.workspaceItem.id) this.store.commit("setWorkspace", this.workspaceItem); }else{ - this.getworkspace() + this.getworkspace('detail') } } }, @@ -342,7 +342,7 @@ export default defineComponent({ // this.getPosition(resolve) // }) await this.getPosition()//获取衣服类型 - this.getworkspace() + this.getworkspace('') this.getSex() }, directives:{ @@ -454,7 +454,7 @@ export default defineComponent({ // this.getworkspace() // this.setPosition('') }, - getworkspace(){ + getworkspace(str:any){ // Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:3}}).then((rv: any) => { // if (rv) { // console.log(rv,'workspace'); @@ -479,6 +479,7 @@ export default defineComponent({ // v.putName = false // }); this.workspace.id = rv.id + if(str == 'detail') this.getDetail(rv.id) this.total = rv.page.total this.workspace.workspaceList = rv.page.content } @@ -533,7 +534,7 @@ export default defineComponent({ if(index){ this.getDetail(index) }else{ - this.getworkspace() + this.getworkspace('') } this.workspace.workspaceList[index].workSpaceName = this.workspaceItemName this.workspace.workspaceList[index].putName = false @@ -546,7 +547,7 @@ export default defineComponent({ deleteWorkspace(data:any){ Https.axiosDelete(Https.httpUrls.workspaceRemove,data).then((rv: any) => { if (rv) { - this.getworkspace() + this.getworkspace('') } }) }, From 785bb8b70ea320214ac7617bd21bac8ad95c4ec8 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 23 May 2024 13:25:19 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E8=B0=83=E6=95=B4layout=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E6=85=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/habit.vue | 18 +++-- src/component/HomePage/MoodboardUpload.vue | 56 ++++++------- src/component/HomePage/SketchboardUpload.vue | 1 + src/component/HomePage/layout.vue | 37 +++++---- src/component/HomePage/layoutMobile.vue | 83 ++++++++++---------- src/tool/domTurnImg.js | 81 ++++++++++--------- 6 files changed, 148 insertions(+), 128 deletions(-) diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 0cc378d1..15e9dc5e 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -89,18 +89,19 @@
- {{ $t('Habit.System') }}(100%) + {{ $t('Habit.System') }}({{systemDesigner.system}}%)
- {{ $t('Habit.Designer') }}(100%) + {{ $t('Habit.Designer') }}({{systemDesigner.designer}}%)
@@ -191,6 +192,10 @@ export default defineComponent({ mannequinType:'', mannequinId:'', }) + let systemDesigner:any = ref({ + system:0, + designer:0, + }) let mannequins:any = ref([{},{}]) let systemSeleves= ref(false); let total= ref(0); @@ -228,6 +233,7 @@ export default defineComponent({ return{ systemSeleves, mannequins, + systemDesigner, openType, total, driver__, @@ -624,10 +630,12 @@ export default defineComponent({ } }, //设置系统设计占比 - systemDesigner(num: number) { + setSystemDesigner(num: number) { this.workspaceItem.systemDesignerPercentage = num }, formatter(value: number) { + this.systemDesigner.system = 100 - value + this.systemDesigner.designer = value let num = Math.abs((value-50)*2) return `${num}%`; }, @@ -908,7 +916,7 @@ export default defineComponent({ } .habit_System_Designer { - margin-top: calc(8rem*1.2); + // margin-top: calc(8rem*1.2); :deep(.ant-slider-track), :deep(.ant-slider-rail) { diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index b4a57975..9c3af979 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -443,8 +443,9 @@ export default defineComponent({ } }, - layout(){ - + async layout(){ + if(this.loadingShow)return + this.loadingShow = true this.store.commit("setDisposeMoodboard", []); let arr = JSON.parse(JSON.stringify(this.store.state.UploadFilesModule.moodboard)) this.layoutList = arr @@ -457,51 +458,52 @@ export default defineComponent({ } if(this.moodb_[arr.length-1].length != 1){ if(JSON.stringify(this.moodb_className) == JSON.stringify(this.moodb_[arr.length-1][random])){ + this.loadingShow = false this.layout() return } } - if(this.loadingShow){ - return - } - this.loadingShow = true this.edieShow = true if(this.moodb_[arr.length-1].length == 2){ this.moodb_className = this.moodb_[arr.length-1][0] }else{ this.moodb_className = this.moodb_[arr.length-1][random] } + this.layoutOpen = true //提交模板 // this.loadingShow = true this.layoutList.forEach((v:any)=>{ v.setPitch = false }) - nextTick().then(async ()=>{ + nextTick().then(()=>{ let layoutCentent = document.getElementById('modal_img') - let file = await domTurnImg(layoutCentent) - let param = new FormData(); - param.append('inPin','0') - param.append('level1Type','Moodboard') - param.append('gender','') - param.append('timeZone',Intl.DateTimeFormat().resolvedOptions().timeZone) - param.append('file',file); - let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*' }} - Https.axiosPost(Https.httpUrls.elementUpload,param,config) - .then((rv: any) => { - let img:any = rv - img.imgUrl = rv.url - img.resData = JSON.parse(JSON.stringify(img)) - this.store.commit("setDisposeMoodboard", img); + domTurnImg(layoutCentent).then((rv)=>{ + let file = rv + let param = new FormData(); + param.append('inPin','0') + param.append('level1Type','Moodboard') + param.append('gender','') + param.append('timeZone',Intl.DateTimeFormat().resolvedOptions().timeZone) + param.append('file',file); + let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*' }} + Https.axiosPost(Https.httpUrls.elementUpload,param,config) + .then((rv: any) => { + let img:any = rv + img.imgUrl = rv.url + img.resData = JSON.parse(JSON.stringify(img)) + this.store.commit("setDisposeMoodboard", img); + this.loadingShow = false + } + ).catch(rv=>{ this.loadingShow = false + }) + if(this.driver__.driver){ + driverObj__.moveNext() } - ).catch(rv=>{ - this.loadingShow = false }) - if(this.driver__.driver){ - driverObj__.moveNext() - } - }) + + }) }, setmoodbClass(val:any){ this.moodb_className = val diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index a25a3ab3..ae5100e6 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -1107,6 +1107,7 @@ export default defineComponent({ cursor: pointer; &:hover .delete_like_file_block{ display: block; + opacity: 1; } img{ object-fit: cover; diff --git a/src/component/HomePage/layout.vue b/src/component/HomePage/layout.vue index e7ea718a..f9ebdb2b 100644 --- a/src/component/HomePage/layout.vue +++ b/src/component/HomePage/layout.vue @@ -610,25 +610,28 @@ export default defineComponent({ }) nextTick().then(async ()=>{ let layoutCentent = document.getElementById('layoutCentent') - let file = await domTurnImg(layoutCentent) - let param = new FormData(); - param.append('inPin','0') - param.append('gender','') - param.append('level1Type','Moodboard') - param.append('timeZone',Intl.DateTimeFormat().resolvedOptions().timeZone) - param.append('file',file); - let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*' }} - Https.axiosPost(Https.httpUrls.elementUpload,param,config) - .then((rv: any) => { - // console.log(rv); - rv.imgUrl = rv.url - this.layout = false + domTurnImg(layoutCentent).then((rv)=>{ + let file =rv + let param = new FormData(); + param.append('inPin','0') + param.append('gender','') + param.append('level1Type','Moodboard') + param.append('timeZone',Intl.DateTimeFormat().resolvedOptions().timeZone) + param.append('file',file); + let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*' }} + Https.axiosPost(Https.httpUrls.elementUpload,param,config) + .then((rv: any) => { + // console.log(rv); + rv.imgUrl = rv.url + this.layout = false + this.loadingShow = false + this.store.commit("setDisposeMoodboard", rv); + } + ).catch(rv=>{ this.loadingShow = false - this.store.commit("setDisposeMoodboard", rv); - } - ).catch(rv=>{ - this.loadingShow = false + }) }) + }) }, diff --git a/src/component/HomePage/layoutMobile.vue b/src/component/HomePage/layoutMobile.vue index bc23fe20..b1498662 100644 --- a/src/component/HomePage/layoutMobile.vue +++ b/src/component/HomePage/layoutMobile.vue @@ -180,6 +180,28 @@ export default defineComponent({ this.uploadUrl = getUploadUrl(); }, directives:{ + modelImg:{ + mounted(el) { + let parentNode = el.parentNode + if(parentNode.offsetHeight > parentNode.offsetWidth){ + el.style.height = 100+'%' + el.style.width = 'auto' + }else{ + el.style.width = 100+'%' + el.style.height = 'auto' + } + }, + updated (el) { + let parentNode = el.parentNode + if(parentNode.offsetHeight > parentNode.offsetWidth){ + el.style.height = 100+'%' + el.style.width = 'auto' + }else{ + el.style.width = 100+'%' + el.style.height = 'auto' + } + } + }, //操作移动 layout:{ mounted (el,layout:any,binding) { @@ -541,28 +563,6 @@ export default defineComponent({ }) }, }, - modelImg:{ - // mounted(el) { - // let parentNode = el.parentNode - // if(parentNode.offsetHeight > parentNode.offsetWidth){ - // el.style.height = 100+'%' - // el.style.width = 'auto' - // }else{ - // el.style.width = 100+'%' - // el.style.height = 'auto' - // } - // }, - // updated (el) { - // let parentNode = el.parentNode - // if(parentNode.offsetHeight > parentNode.offsetWidth){ - // el.style.height = 100+'%' - // el.style.width = 'auto' - // }else{ - // el.style.width = 100+'%' - // el.style.height = 'auto' - // } - // } - } }, methods: { init(){ @@ -641,27 +641,28 @@ export default defineComponent({ }) nextTick().then(async ()=>{ let layoutCentent = document.getElementById('layoutCentent') - let file = await domTurnImg(layoutCentent) - let param = new FormData(); - param.append('inPin','0') - param.append('gender','') - param.append('level1Type','Moodboard') - param.append('timeZone',Intl.DateTimeFormat().resolvedOptions().timeZone) - param.append('file',file); - let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*' }} - Https.axiosPost(Https.httpUrls.elementUpload,param,config) - .then((rv: any) => { - // console.log(rv); - rv.imgUrl = rv.url - this.layout = false + domTurnImg(layoutCentent).then((rv)=>{ + let file = rv + let param = new FormData(); + param.append('inPin','0') + param.append('gender','') + param.append('level1Type','Moodboard') + param.append('timeZone',Intl.DateTimeFormat().resolvedOptions().timeZone) + param.append('file',file); + let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*' }} + Https.axiosPost(Https.httpUrls.elementUpload,param,config) + .then((rv: any) => { + // console.log(rv); + rv.imgUrl = rv.url + this.layout = false + this.loadingShow = false + this.store.commit("setDisposeMoodboard", rv); + } + ).catch(rv=>{ this.loadingShow = false - this.store.commit("setDisposeMoodboard", rv); - } - ).catch(rv=>{ - this.loadingShow = false + }) }) }) - }, beforeUpload(){ @@ -900,6 +901,8 @@ export default defineComponent({ // object-fit: cover; // width: 100%; // height: 100%; + height: 100%; + width: auto; pointer-events: none; float: left; user-select:none; diff --git a/src/tool/domTurnImg.js b/src/tool/domTurnImg.js index 018967a3..a392f7e9 100644 --- a/src/tool/domTurnImg.js +++ b/src/tool/domTurnImg.js @@ -1,45 +1,48 @@ import html2canvas from "html2canvas"; const getJpeg = dom =>{ - return new Promise(resolve =>{ - html2canvas(dom,{useCORS: true,}).then(canvas =>{ - let base64 = canvas.toDataURL('image/jpeg',.9); - let quality = 0.9 // 压缩系数0-1之间 - let newImage = new Image() - newImage.src = base64 - newImage.setAttribute('crossOrigin', 'Anonymous') // url为外域时需要 - let imgWidth, - imgHeight - let w = undefined - newImage.onload = function () { - w = this.width * 1 - imgWidth = this.width - imgHeight = this.height - let canvas = document.createElement('canvas') - let ctx = canvas.getContext('2d') - if (Math.max(imgWidth, imgHeight) > w) { - if (imgWidth > imgHeight) { - canvas.width = w - canvas.height = w * (imgHeight / imgWidth) - } else { - canvas.height = w - canvas.width = w * (imgWidth / imgHeight) - } - } else { - canvas.width = imgWidth - canvas.height = imgHeight - quality = 0.6 - } - ctx.clearRect(0, 0, canvas.width, canvas.height) - ctx.drawImage(this, 0, 0, canvas.width, canvas.height) // // 这里面的 this 指向 newImage - let smallBase64 = canvas.toDataURL('image/jpeg', quality) // 压缩语句 - let fileData = dataURLtoFile(smallBase64); - let fileOfBlob = new File([fileData], new Date() + ".jpg"); // 命名图片名 - // console.log(smallBase64); - // resolve(base64ToFile(fileOfBlob)) - resolve(fileOfBlob) - } + return new Promise(resolve =>{ + setTimeout(() => { + html2canvas(dom,{useCORS: true,}).then(canvas =>{ + let base64 = canvas.toDataURL('image/jpeg',.9); + // let quality = 0.9 // 压缩系数0-1之间 + let newImage = new Image() + newImage.src = base64 + newImage.setAttribute('crossOrigin', 'Anonymous') // url为外域时需要 + // let imgWidth, + // imgHeight + // let w = undefined + newImage.onload = function () { + // w = this.width * 1 + // imgWidth = this.width + // imgHeight = this.height + // let canvas = document.createElement('canvas') + // let ctx = canvas.getContext('2d') + // if (Math.max(imgWidth, imgHeight) > w) { + // if (imgWidth > imgHeight) { + // canvas.width = w + // canvas.height = w * (imgHeight / imgWidth) + // } else { + // canvas.height = w + // canvas.width = w * (imgWidth / imgHeight) + // } + // } else { + // canvas.width = imgWidth + // canvas.height = imgHeight + // quality = 0.6 + // } + // ctx.clearRect(0, 0, canvas.width, canvas.height) + // ctx.drawImage(this, 0, 0, canvas.width, canvas.height) // // 这里面的 this 指向 newImage + // let smallBase64 = canvas.toDataURL('image/jpeg', quality) // 压缩语句 + let fileData = dataURLtoFile(base64); + let fileOfBlob = new File([fileData], new Date() + ".jpg"); // 命名图片名 + // console.log(smallBase64); + // resolve(base64ToFile(fileOfBlob)) + resolve(fileOfBlob) + } + }) + }, 100); }) - }) + } //base64转成blob function dataURLtoFile(dataURI, type) { From 8e60a51d9f9b5901759dd73a2c75b9329ae353ee Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 24 May 2024 13:32:19 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=95=BF=E6=8C=89=E9=80=89=E4=B8=AD=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignPrintOperationMobile.vue | 5 +++++ src/component/Detail/setDesignItemMobile.vue | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index 0bef035f..f9351650 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -755,6 +755,11 @@ export default defineComponent({