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/habit.vue b/src/component/Detail/habit.vue index 3e0148de..1d8e89f7 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -268,6 +268,8 @@ export default defineComponent({ this.openType.model = false // this.getDetail(this.workspaceItem.id) this.store.commit("setWorkspace", this.workspaceItem); + }else{ + this.getworkspace() } } }, @@ -289,7 +291,6 @@ export default defineComponent({ if(v.id == oldVal){ delete v.isLastIndex this.putWorkspace(v,newVal) - this.getDetail(newVal) } }) this.getMannequins() @@ -335,8 +336,6 @@ export default defineComponent({ // }) await this.getPosition() if(this.workspaceItem.id == -1){ - console.log(123123123123); - this.getworkspace() } this.getSex() @@ -465,35 +464,75 @@ 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.getDetail(rv.id) this.total = rv.page.total this.workspace.id = rv.id - // if(this.workspace.workspaceList){ - // this.workspace.workspaceList.push(...rv.page.content) - // }else{ - // this.workspace.workspaceList = rv.page.content - // } this.workspace.workspaceList = rv.page.content + return + 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.workspaceItem.keyWord = { + // Moodboard:[{ + // name:'Moodboard', + // id:1, + // },{ + // name:'Moodboard', + // id:2, + // },{ + // name:'Moodboard', + // id:3, + // }], + // Printboard:[{ + // name:'Printboard', + // id:1, + // },{ + // name:'Printboard', + // id:2, + // },{ + // name:'Printboard', + // id:3, + // }], + // Sketchboard:[{ + // name:'Sketchboard', + // id:1, + // },{ + // name:'Sketchboard', + // id:2, + // },{ + // name:'Sketchboard', + // id:3, + // }], + // } + // this.setMannequinsSex() + // this.setPosition('') + } + }); + } }) }, getDetail(id:any){// Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => { if (rv) { - // this.getworkspace() + if(rv.position == "Overall"){ + rv.overallSingle = false + }else{ + rv.overallSingle = true + } + rv.putName = false + this.workspaceItem = rv + console.log(rv); + + this.setMannequinsSex() + this.setPosition('') } }) }, @@ -514,7 +553,6 @@ export default defineComponent({ } } }) - }, putWorkspace(data:any,index:any){//修改workspace if(this.workspaceItem.id == -1){ 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/Generate.vue b/src/component/HomePage/Generate.vue index 20060a1c..e63b34cd 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -79,17 +79,17 @@