This commit is contained in:
X1627315083
2024-01-02 16:22:33 +08:00
parent f6d006b834
commit fbf441f2c7
5 changed files with 10 additions and 5 deletions

View File

@@ -328,8 +328,8 @@ export default defineComponent({
store: useStore(), store: useStore(),
}; };
}, },
mounted() { async mounted() {
this.getPosition() await this.getPosition()
this.getworkspace() this.getworkspace()
this.getSex() this.getSex()
}, },
@@ -406,6 +406,8 @@ export default defineComponent({
num = 1 num = 1
} }
this.singleTypeList = this.position[num].value this.singleTypeList = this.position[num].value
console.log(this.position[num],this.singleTypeList);
this.store.commit("setWorkspacePosition", this.position[num].value); this.store.commit("setWorkspacePosition", this.position[num].value);
if(str == 'sex'){ if(str == 'sex'){

View File

@@ -39,7 +39,7 @@
<li class="printModel_item" @click="setprintModel(1)">{{ $t('Generate.Model1') }}</li> <li class="printModel_item" @click="setprintModel(1)">{{ $t('Generate.Model1') }}</li>
<li class="printModel_item" @click="setprintModel(2)">{{ $t('Generate.Model2') }}</li> <li class="printModel_item" @click="setprintModel(2)">{{ $t('Generate.Model2') }}</li>
<li class="printModel_item" @click="setprintModel(3)">{{ $t('Generate.Model3') }}</li> <li class="printModel_item" @click="setprintModel(3)">{{ $t('Generate.Model3') }}</li>
<li v-show="printBoards.length >= 1" class="printModel_item" @click="setprintModel(4)">{{ $t('Generate.Generate') }}</li> <li v-show="printBoards.length >= 1" class="printModel_item" @click="setprintModel(4)">{{ $t('Generate.Merge') }}</li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -436,7 +436,7 @@ export default defineComponent({
num : 'Generate', num : 'Generate',
optype:false, optype:false,
value:'', value:'',
name:this.t('Generate.Generate') name:this.t('Generate.Merge')
} }
}else{ }else{
this.printModel = { this.printModel = {
@@ -603,6 +603,7 @@ export default defineComponent({
document.addEventListener("click", this.hiddenFileCategory); document.addEventListener("click", this.hiddenFileCategory);
}, },
selectFileCategory(file: any, cate: any) { selectFileCategory(file: any, cate: any) {
file.categoryValue = cate?.value;
file.category = cate.name; file.category = cate.name;
file.categoryShow = false file.categoryShow = false
// this.store.commit("setSketchboardFile", this.sketchboardList); // this.store.commit("setSketchboardFile", this.sketchboardList);

View File

@@ -28,7 +28,7 @@
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i> <i v-else class="fi fi-sr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i>
</div> </div>
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']"> <div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img,index)"></i> <i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img,imgIndex)"></i>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -255,6 +255,7 @@ export default {
Model3:'Real Style', Model3:'Real Style',
inputContent1:'Input prompt', inputContent1:'Input prompt',
Generate:'Generate', Generate:'Generate',
Merge:'Merge',
maximumLength:'The entered content exceeds the maximum length.', maximumLength:'The entered content exceeds the maximum length.',
Model:'Model', Model:'Model',
jsContent1:"You can only upload Image file!", jsContent1:"You can only upload Image file!",

View File

@@ -449,6 +449,7 @@ export default defineComponent({
// console.log(num,this.allBoardData?.sketchboardFiles.length); // console.log(num,this.allBoardData?.sketchboardFiles.length);
} }
}); });
}); });
if(this.allBoardData?.sketchboardFiles?.length && this.allBoardData?.sketchboardFiles?.length>0){ if(this.allBoardData?.sketchboardFiles?.length && this.allBoardData?.sketchboardFiles?.length>0){
if(num != this.allBoardData?.sketchboardFiles?.length){ if(num != this.allBoardData?.sketchboardFiles?.length){