This commit is contained in:
X1627315083
2024-05-22 14:58:43 +08:00
7 changed files with 82 additions and 42 deletions

View File

@@ -141,7 +141,6 @@ export default defineComponent({
//获取列表 //获取列表
gettrialList() { gettrialList() {
Https.axiosGet(Https.httpUrls.inquiryGetTrial).then((rv)=>{ Https.axiosGet(Https.httpUrls.inquiryGetTrial).then((rv)=>{
console.log(rv);
this.dataList = rv this.dataList = rv
}) })

View File

@@ -1195,7 +1195,8 @@ export default defineComponent({
position: relative; position: relative;
width: auto; width: auto;
max-height: 100%; max-height: 100%;
max-width: 100%;
object-fit: contain;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
} }

View File

@@ -268,6 +268,8 @@ export default defineComponent({
this.openType.model = false this.openType.model = false
// this.getDetail(this.workspaceItem.id) // this.getDetail(this.workspaceItem.id)
this.store.commit("setWorkspace", this.workspaceItem); this.store.commit("setWorkspace", this.workspaceItem);
}else{
this.getworkspace()
} }
} }
}, },
@@ -289,7 +291,6 @@ export default defineComponent({
if(v.id == oldVal){ if(v.id == oldVal){
delete v.isLastIndex delete v.isLastIndex
this.putWorkspace(v,newVal) this.putWorkspace(v,newVal)
this.getDetail(newVal)
} }
}) })
this.getMannequins() this.getMannequins()
@@ -335,8 +336,6 @@ export default defineComponent({
// }) // })
await this.getPosition() await this.getPosition()
if(this.workspaceItem.id == -1){ if(this.workspaceItem.id == -1){
console.log(123123123123);
this.getworkspace() this.getworkspace()
} }
this.getSex() this.getSex()
@@ -465,35 +464,75 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.workspaceList,data).then((rv: any) => { Https.axiosPost(Https.httpUrls.workspaceList,data).then((rv: any) => {
if (rv) { if (rv) {
rv.page.content.forEach((v:any) => { this.getDetail(rv.id)
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 this.total = rv.page.total
this.workspace.id = rv.id 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 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){// getDetail(id:any){//
Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => { Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => {
if (rv) { 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 putWorkspace(data:any,index:any){//修改workspace
if(this.workspaceItem.id == -1){ if(this.workspaceItem.id == -1){

View File

@@ -151,7 +151,6 @@ export default defineComponent({
} }
let fontBackMove = [] let fontBackMove = []
canvas.on('selection:created', (e)=> { canvas.on('selection:created', (e)=> {
console.log(3213123123);
// console.log(canvas.getActiveObject()); // console.log(canvas.getActiveObject());
// // if() // // if()
// console.log(frontBack.front.find(person => person.id === canvas.getActiveObject().id)); // console.log(frontBack.front.find(person => person.id === canvas.getActiveObject().id));

View File

@@ -79,17 +79,17 @@
<div class="search_keyword" v-show="isInputFocus" @click.stop=""> <div class="search_keyword" v-show="isInputFocus" @click.stop="">
<div class="search_keyword_center"> <div class="search_keyword_center">
<div class="search_keyword_center_left"> <div class="search_keyword_center_left">
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
<div @click.stop="cliSetKeyword" class="search_keyword_center_item">asdasd</div> <div @click.stop="cliSetKeyword('asdasd')" class="search_keyword_center_item">asdasd</div>
</div> </div>
</div> </div>
</div> </div>
@@ -669,8 +669,14 @@ export default defineComponent({
setTextareaShow(){ setTextareaShow(){
this.isTextarea = !this.isTextarea this.isTextarea = !this.isTextarea
}, },
cliSetKeyword(){ cliSetKeyword(value:any){
console.log(this.workspace);
let str = ''
if(this.searchPictureName[this.searchPictureName.length-1] != ',' && this.searchPictureName.length != 0){
str = ','
}
this.searchPictureName += str + value
}, },
ifMaximumLength(){ ifMaximumLength(){
clearTimeout(this.inputTime) clearTimeout(this.inputTime)

View File

@@ -248,8 +248,6 @@ export default defineComponent({
}, },
selectImgItem(imgData:any){ selectImgItem(imgData:any){
console.log(imgData);
let parent:any = this.$parent let parent:any = this.$parent
if(parent.isUseGenerate){ if(parent.isUseGenerate){
this.setUseGenerate([]) this.setUseGenerate([])

View File

@@ -207,7 +207,6 @@ export default defineComponent({
let likeFile = (item:any,type:string) => { let likeFile = (item:any,type:string) => {
} }
let getImgScale = (index:any)=>{ let getImgScale = (index:any)=>{
console.log(newScaleImage.value);
newScaleImage.value.scaleImageMask = true newScaleImage.value.scaleImageMask = true
newScaleImage.value.init(filter.worksList,index) newScaleImage.value.init(filter.worksList,index)
} }