From d35f24d817321996d94caf941e34ff1b32cabfe8 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 10 Oct 2025 13:03:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E5=88=B7?= =?UTF-8?q?=E6=96=B0sketch=E4=BC=9A=E5=A2=9E=E5=8A=A0=E5=92=8C=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E6=9D=BF=E5=9D=97=E5=85=B3=E9=97=AD=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E6=89=93=E5=BC=80=E9=A2=9C=E8=89=B2=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/Generate copy.vue | 1268 ----------------- src/component/HomePage/Generate.vue | 4 +- .../HomePage/NewCollectionReview.vue | 14 +- src/component/HomePage/generalMenu.vue | 1 - .../design/collection/ColorboardUpload.vue | 10 +- src/component/home/design/index.vue | 1 + src/component/home/design/mannequin/index.vue | 12 + src/component/home/index.vue | 3 +- src/lang/cn.ts | 1 + src/lang/en.ts | 1 + src/store/homeStore/homeStore.ts | 1 + src/store/workspace/workspace.ts | 2 - 12 files changed, 37 insertions(+), 1281 deletions(-) delete mode 100644 src/component/HomePage/Generate copy.vue diff --git a/src/component/HomePage/Generate copy.vue b/src/component/HomePage/Generate copy.vue deleted file mode 100644 index 8b420cf9..00000000 --- a/src/component/HomePage/Generate copy.vue +++ /dev/null @@ -1,1268 +0,0 @@ - - - diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index ad673657..ce1f25e2 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -507,7 +507,6 @@ export default defineComponent({ watch( () => scene.value, (newVal, oldVal) => { - console.log('scene-------------newVal', newVal) if (newVal.value == 'extract') { speed.speedData = { ...speed.extractList[0] @@ -869,7 +868,7 @@ export default defineComponent({ } data = { generateType: 'text', - designType: 'collection', + designType: this.sketchboardList[0]?.designType?this.sketchboardList[0].designType:'collection', collectionElementId: collectionElementId, level1Type: this.upload.level1Type, level2Type: level2Type, @@ -1289,6 +1288,7 @@ export default defineComponent({ status: 'done', ...data, errCode: 0, + designType:'Library', imgUrl: data.url, xhr: { response: JSON.stringify({ diff --git a/src/component/HomePage/NewCollectionReview.vue b/src/component/HomePage/NewCollectionReview.vue index 2b717b6d..9f447ac9 100644 --- a/src/component/HomePage/NewCollectionReview.vue +++ b/src/component/HomePage/NewCollectionReview.vue @@ -136,7 +136,7 @@ export default defineComponent({ data(){ return{ imgOpen:true, - + setSketchTime:null as any, } }, watch: { @@ -153,12 +153,18 @@ export default defineComponent({ newArr.push(newVal?.[index]?.id?newVal?.[index]?.id:newVal?.[index]?.sketchBoardIdd) }); if(JSON.stringify(newArr)!=JSON.stringify(oldArr)){ - this.setSketch() + clearTimeout(this.setSketchTime) + this.setSketchTime = setTimeout(()=>{ + this.setSketch() + },500) this.imgOpen = true } }else{ nextTick(()=>{ - this.setSketch() + clearTimeout(this.setSketchTime) + this.setSketchTime = setTimeout(()=>{ + this.setSketch() + },500) this.imgOpen = true }) } @@ -201,6 +207,7 @@ export default defineComponent({ let sketchH = [0,0,0] nextTick().then(async ()=>{ if(this.sketchList && this.sketchList!=null){ + console.log(JSON.parse(JSON.stringify(this.sketch)),JSON.parse(JSON.stringify(this.sketchList))) for (let i = 0; i < this.sketchList?.length; i++) { let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() let sketch2:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() @@ -232,6 +239,7 @@ export default defineComponent({ } }) } + console.log(JSON.parse(JSON.stringify(this.sketch))) this.imgOpen = true this.store.commit('setshowSketchList', this.sketch) } diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue index 61c26a43..eda6986f 100644 --- a/src/component/HomePage/generalMenu.vue +++ b/src/component/HomePage/generalMenu.vue @@ -213,7 +213,6 @@ import { message, Upload, Modal } from "ant-design-vue"; onMounted(() => { instance.appContext.config.globalProperties.$dropdownEvents.onClose(removePrintModel) window.addEventListener('scroll', handleScroll, true) - console.log(instance,) }) onUnmounted(() => { diff --git a/src/component/home/design/collection/ColorboardUpload.vue b/src/component/home/design/collection/ColorboardUpload.vue index 821157a6..0d7da54f 100644 --- a/src/component/home/design/collection/ColorboardUpload.vue +++ b/src/component/home/design/collection/ColorboardUpload.vue @@ -450,7 +450,7 @@ export default defineComponent({ //清除当前的颜色 clearCurrentColor(index){ - this.selectColor = {} + // this.selectColor = {} // this.fileList = [] this.reviewColor={} this.colorList[index] = {} @@ -673,6 +673,7 @@ export default defineComponent({ openSetData(){ let colorList = this.store.state.UploadFilesModule.allBoardData.colorBoards + this.colorList = [{},{},{},{},{},{},{},{}] let hex colorList.forEach((ele, index) => { this.colorList[index] = ele @@ -681,10 +682,11 @@ export default defineComponent({ this.colorList[index].gradient = ele.gradient this.colorList[index].name = ele.name }); - if(this.colorList[0]?.gradient && this.colorList[0]?.gradient?.selectIndex>-1 && this.colorList[0]?.gradient?.gradientShow){ - this.selectColor = {rgba:this.colorList[0].gradient.gradientList[0].rgba,hex:hex} //顔色选择器默认颜色 + this.selectIndex = colorList.length - 1 + if(this.colorList[colorList.length - 1]?.gradient && this.colorList[colorList.length - 1]?.gradient?.selectIndex>-1 && this.colorList[colorList.length - 1]?.gradient?.gradientShow){ + this.selectColor = {rgba:this.colorList[colorList.length - 1].gradient.gradientList[colorList.length - 1].rgba,hex:hex} //顔色选择器默认颜色 }else{ - this.selectColor = {rgba:this.colorList[0].rgba,hex:hex} //顔色选择器默认颜色 + this.selectColor = {rgba:this.colorList[colorList.length - 1].rgba,hex:hex} //顔色选择器默认颜色 } this.store.commit('setColorboardList',colorList) }, diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue index bfe29b3f..198971d5 100644 --- a/src/component/home/design/index.vue +++ b/src/component/home/design/index.vue @@ -2185,6 +2185,7 @@ export default defineComponent({ // padding-right:5rem; overflow: initial !important; position: relative; + padding: .5rem 0; .page_content { position: relative; diff --git a/src/component/home/design/mannequin/index.vue b/src/component/home/design/mannequin/index.vue index c4380c01..e26a492c 100644 --- a/src/component/home/design/mannequin/index.vue +++ b/src/component/home/design/mannequin/index.vue @@ -152,6 +152,11 @@ export default defineComponent({ } }) if(index != -1){ + let num = data.selectObject.model.filter((item:any)=>item.level3Type == data.selectObject.sex).length + if(num <= 1 && data.selectObject.model[index].level3Type == data.selectObject.sex){ + message.info(t('LibraryPage.jsContent14'))//最多选择四个 + return + } if(list.length > 1){ list.splice(index,1) }else{ @@ -163,6 +168,7 @@ export default defineComponent({ id:item.id, url:item.presignedUrl || item.url, type:item.type?item.type:data.systemUser?'System':'Library', + level3Type:data.selectObject.sex, } list.push(model) }else{ @@ -170,7 +176,13 @@ export default defineComponent({ } } } + const deleteSelectModel = (index:number)=>{ + let num = data.selectObject.model.filter((item:any)=>item.level3Type == data.selectObject.sex).length + if(num <= 1 && data.selectObject.model[index].level3Type == data.selectObject.sex){ + message.info(t('LibraryPage.jsContent14'))//最多选择四个 + return + } let list = store.state.Workspace.probjects.model if(list.length > 1){ list.splice(index,1) diff --git a/src/component/home/index.vue b/src/component/home/index.vue index 316c361d..731a3827 100644 --- a/src/component/home/index.vue +++ b/src/component/home/index.vue @@ -241,7 +241,8 @@ export default defineComponent({ url:item.url, id:item.mannequinRelationId, type:item.mannequinRelationType, - collectionElementId:item.collectionId + collectionElementId:item.collectionId, + level3Type:item.level3Type }) }) store.commit('setProbject',{model:arr}) diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 13d1a3a1..42f8a3d9 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -336,6 +336,7 @@ export default { jsContent11: "你确定删除当前品牌DNA吗？", jsContent12: "请先取消选中后就再次点击删除", jsContent13: "您必须选择至少一个模特，且最多不超过四个", + jsContent14: "您必须选择一个当前项目性别相同的模特", }, HistoryPage: { History: "历史", diff --git a/src/lang/en.ts b/src/lang/en.ts index 51e78367..44a737dd 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -336,6 +336,7 @@ export default { jsContent11: "Are you sure about deleting the current brand DNA?", jsContent12: "Please deselect first, then try deleting again.", jsContent13: "You must select at least one mannequin and no more than four.", + jsContent14: "You must select a model whose gender is the same as that of the current project.", }, HistoryPage: { History: "History", diff --git a/src/store/homeStore/homeStore.ts b/src/store/homeStore/homeStore.ts index ef0780ef..58052261 100644 --- a/src/store/homeStore/homeStore.ts +++ b/src/store/homeStore/homeStore.ts @@ -256,6 +256,7 @@ const HomeStoreModule : Module = { deReconstruction:null, canvas:null } + state.showSketchList = [] }, setTemplateData(state,data){ state.templateId=data.id diff --git a/src/store/workspace/workspace.ts b/src/store/workspace/workspace.ts index bad287f7..e0212554 100644 --- a/src/store/workspace/workspace.ts +++ b/src/store/workspace/workspace.ts @@ -70,12 +70,10 @@ const Workspace : Module = { state.projectList = list }, setProbject(state,data){ - console.log(123123,data) for (const key in data) { if(data[key] == undefined)continue state.probjects[key] = data[key] } - console.log(state.probjects) }, createProbject(state){ state.probjects = {