fix
This commit is contained in:
@@ -281,13 +281,14 @@ export default defineComponent({
|
||||
let generateCheckbox:any = ref()
|
||||
let loadingShow = ref(false)
|
||||
|
||||
let sketchCatecoryList:any = ref({})
|
||||
let sketchCatecoryList:any = computed(()=>{
|
||||
return store.state.Workspace.workspacePosition
|
||||
})
|
||||
let workspace:any = ref({})
|
||||
let inputShow = ref(false)
|
||||
let inputTime = ref()
|
||||
let sketchboardList:any = computed(()=>{
|
||||
return store.state.UploadFilesModule.sketchboard
|
||||
|
||||
})
|
||||
let {t} = useI18n()
|
||||
let driver__:any = inject('driver__')
|
||||
@@ -321,6 +322,7 @@ export default defineComponent({
|
||||
upload: {
|
||||
isPin: 0,
|
||||
level1Type: "Sketchboard",
|
||||
gender:'',
|
||||
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
},
|
||||
token: "",
|
||||
@@ -375,7 +377,10 @@ export default defineComponent({
|
||||
watch:{
|
||||
workspaceCom(newVal,oldVal){
|
||||
this.workspace = newVal
|
||||
this.getPosition()
|
||||
this.upload.gender = newVal.sexEnum.name
|
||||
console.log(this.workspace);
|
||||
|
||||
// this.getPosition()
|
||||
},
|
||||
sketchboardList:{
|
||||
handler(newVal:any,oldVal:any){
|
||||
@@ -427,20 +432,6 @@ export default defineComponent({
|
||||
})
|
||||
}
|
||||
},
|
||||
getPosition(){
|
||||
let params
|
||||
if(this.workspace?.sexEnum?.name == 'Female'){
|
||||
params = 'FemalePosition'
|
||||
}else{
|
||||
params = 'MalePosition'
|
||||
}
|
||||
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
|
||||
if (rv) {
|
||||
|
||||
this.sketchCatecoryList = rv
|
||||
}
|
||||
})
|
||||
},
|
||||
getgenerateCheckbox(value:any){
|
||||
this.generateCheckbox = value
|
||||
},
|
||||
@@ -451,6 +442,7 @@ export default defineComponent({
|
||||
file.imgUrl = res.data.url;
|
||||
file.resData = res.data;
|
||||
// file.pin = false;
|
||||
//category用来数据处理
|
||||
file.categoryValue = this.sketchCatecoryList?.[0]?.value;
|
||||
file.category = this.sketchCatecoryList?.[0]?.name;
|
||||
file.categoryShow = false;
|
||||
|
||||
@@ -88,10 +88,14 @@ export default defineComponent({
|
||||
let driver__:any = computed(()=>{
|
||||
return store.state.Guide.guide
|
||||
})
|
||||
let workspace:any = computed(()=>{
|
||||
return store.state.Workspace.workspace
|
||||
})
|
||||
provide('driver__',driver__)
|
||||
let isShowMark = ref(false)
|
||||
return {
|
||||
driver__,
|
||||
workspace,
|
||||
t,
|
||||
isShowMark,
|
||||
}
|
||||
@@ -171,7 +175,37 @@ export default defineComponent({
|
||||
}
|
||||
});
|
||||
},
|
||||
isPin(list:any){
|
||||
this.workspace
|
||||
let numTop = 0
|
||||
let numBottom = 0
|
||||
let top:any
|
||||
let bottom:any
|
||||
if(this.workspace.sexEnum.name == "Female"){
|
||||
top = ['Outwear','Blouse']
|
||||
bottom = ['Dress','Trousers','Skirt']
|
||||
}else{
|
||||
top = ['Outwear','Tops']
|
||||
bottom = ['Bottoms']
|
||||
}
|
||||
console.log(this.workspace);
|
||||
|
||||
|
||||
list.forEach((item:any,index:number) => {
|
||||
console.log(item);
|
||||
top.forEach((positionItem:any) => {
|
||||
if(item.category == positionItem && item.pin){
|
||||
numTop++
|
||||
}else{
|
||||
numBottom++
|
||||
}
|
||||
});
|
||||
});
|
||||
if(numTop >= 8 || numBottom >= 8){
|
||||
// message.warning(this.t('SketchboardUpload.jsContent1'));
|
||||
return
|
||||
}
|
||||
},
|
||||
//完成
|
||||
finishCollection(){
|
||||
this.isShowMark = true
|
||||
@@ -187,6 +221,8 @@ export default defineComponent({
|
||||
arr.push(obj)
|
||||
});
|
||||
let data = {sketchBoards:arr}
|
||||
// console.log(this.position);
|
||||
this.isPin(sketchList)
|
||||
let elList = document.querySelectorAll('.img_block_item_sketch img')
|
||||
Https.axiosPost(Https.httpUrls.sketchBoardsBoundingBox, data)
|
||||
.then((rv: any) => {
|
||||
|
||||
Reference in New Issue
Block a user