aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
wxd
2024-10-20 15:58:29 +08:00
parent 16df45d4be
commit 269f34838b
8 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/component/HomePage/ExportModel.vue
View File

@@ -23,13 +23,13 @@
<div class="exportCanvasBox_left">
<!-- <div class="exportCanvasBox_title">{{ $t('exportModel.CanvasSize') }}</div> -->
<!-- <label>
<!-- <label style="width: 10%">
<div>Width:</div>
<input type="number" @input="setMaxInput('width', 500)" v-model="canvasWH.width"/>
<input type="number" @input="setMaxInput('width', 1000)" v-model="canvasWH.width"/>
</label> -->
<label>
<label style="width: 10%">
<div>{{ $t('exportModel.Height') }}:</div>
<input type="number" @input="setMaxInput('height', 30000)" v-model="canvasWH.height" />
<input type="number" @input="setMaxInput('height', 30000)" v-model="canvasWH.height" style="max-width: 50%"/>
</label>
<div class="exportCanvasBox_title" @click.stop="setCloseNav('nav')">
{{ $t('exportModel.CanvasNav') }}
@@ -2292,7 +2292,7 @@ export default defineComponent({
input,select {
// width: 10em;
flex: 1;
overflow: hidden;
overflow: hidden !important;
height: 4.5rem;
}

2
src/component/HomePage/PrintboardUpload.vue
View File

@@ -28,7 +28,7 @@
</div>
<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
<div @click.stop="openPrintModel">{{ scene.name }} <i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></div>
<div @click.stop="openPrintModel"><span>{{ scene.name }}</span> <i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></div>
<ul v-show="openMenu">
<li
v-for="item,index in printCatecoryList"

5
src/component/HomePage/SketchboardUpload.vue
View File

@@ -24,7 +24,8 @@
<span>{{ $t('SketchboardUpload.Generate') }}</span>
</div>
<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
<div @click.stop="openPrintModel">{{ scene.name }} <i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></div>
<div @click.stop="openPrintModel"> <span>{{ scene.name }}</span>
<i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></div>
<ul v-show="openMenu">
<li
v-for="item,index in sketchStyleList"
@@ -665,8 +666,6 @@ export default defineComponent({
i{
transition: all .3s;
display: inline-block;
position: absolute;
right: 0;
}
.forbidden{
transform: rotate(180deg);

23
src/component/HomePage/generalMenu.vue
View File

@@ -4,6 +4,7 @@
<a-popover v-if="isCanvas">
<template #content>
<img style="width: 10rem;height: 10rem;object-fit: contain;" :src="item.img" alt="">
<span style="text-align: center;">{{ $t('Generate.referenceImage') }}</span>
</template>
<span v-if="item?.label">{{ item?.label }}</span>
<span v-else>{{ item.name }}</span>
@@ -200,18 +201,26 @@ import { message, Upload, Modal } from "ant-design-vue";
margin-right: 2rem;
>div{
width: calc(13rem*1.2);
// display: flex;
display: block;
width: calc(13rem*1.2);
border-radius: calc(1rem*1.2);
margin: 0;
border: 2px solid;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding: 0 calc(1rem*1.2);
text-align: center;
display: flex;
justify-content: space-around;
> span{
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
>i{
justify-content: center;
position: relative;
}
}
ul{
position: absolute;
@@ -256,9 +265,5 @@ import { message, Upload, Modal } from "ant-design-vue";
}
}
}
.generalMenu_printModel_upload{
>i{
justify-content: center;
}
}
</style>

1
src/component/HomePage/scaleImage.vue
View File

@@ -497,6 +497,7 @@ export default defineComponent({
.productImg_modal{
position: absolute;
left: 0;
z-index: 9;
.productImg_left{
width: 100%;
.productImg_content_item_generate_btn{

2
src/lang/cn.ts
View File

@@ -48,7 +48,7 @@ export default {
CanvasSize:'画布大小',
Height:'高',
Width:'宽',
CanvasNav:'缩略图',
CanvasNav:'系列',
CanvasTool:'画布工具',
Color:'颜色',
Size:'大小',

2
src/lang/en.ts
View File

@@ -48,7 +48,7 @@ export default {
CanvasSize:'Canvas Size',
Height:'Height',
Width:'Width',
CanvasNav:'Elements',
CanvasNav:'Collection',
CanvasTool:'Canvas Tool',
Color:'Color',
Size:'Size',

32
src/views/HomeView/library.vue
View File

@@ -43,6 +43,7 @@
v-show="selectCode != 'DesignElements' && selectCode != 'Printboard'"
v-model:value="sex"
:options="sexList"
:fieldNames="{ label: 'name', value: 'value' }"
@change="sexChange"
>
<template #suffixIcon
@@ -889,11 +890,13 @@ export default defineComponent({
},
async sexChange(){
if(this.uploadGenerate == 'Generate' && this.selectCode == 'Sketchboard'){
}else{
// this.scene = this.designTypeList[this.selectCode].filter((item:any)=>item.value == this.designType)[0]
await this.getPosition()
}
// if(this.uploadGenerate == 'Generate' && this.selectCode == 'Sketchboard'){
// }else{
// // this.scene = this.designTypeList[this.selectCode].filter((item:any)=>item.value == this.designType)[0]
// await this.getPosition()
// }
await this.getPosition()
if(this.uploadGenerate == 'Generate')return
this.currentPage = 1
this.getLibraryList('')
@@ -1015,7 +1018,7 @@ export default defineComponent({
mask:false,
centered:true,
onOk() {
_this.confirmDeletePic(data,index)
_this.confirmDeletePic(data,index,'')
}
});
},
@@ -1059,19 +1062,20 @@ export default defineComponent({
cancelText: 'No',
centered:true,
onOk() {
_this.confirmDeletePic('',0)
_this.confirmDeletePic('',0,'')
}
});
},
//确定删除图片 有data则是单个
confirmDeletePic(data:any,index:any){
confirmDeletePic(data:any,index:any,nData:any){
let libraryIds = data ? [data.id] : this.selectImgList
let newData = {
libraryIds:libraryIds,
deleteModelConfirm:data.level1Type == 'Models' ? data.deleteModelConfirm?data.deleteModelConfirm : 0:'',
deleteModelConfirm:this.selectCode == 'Models' ? data.deleteModelConfirm?data.deleteModelConfirm : 0:'',
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
if(nData)newData = nData
Https.axiosPost(Https.httpUrls.batchDeleteLibrary, newData).then(
(rv: any) => {
if(data && data.id){
@@ -1082,7 +1086,7 @@ export default defineComponent({
}
}
).catch((res)=>{
if(data.level1Type == "Models" && res.errCode === 2){
if(this.selectCode == "Models" && res.errCode === 2){
let _this = this
Modal.confirm({
title: res.errMsg,
@@ -1093,7 +1097,7 @@ export default defineComponent({
zIndex:99999,
centered:true,
onOk() {
data.deleteModelConfirm = 1
newData.deleteModelConfirm = 1
let id = _this.store.state.Workspace.workspace.id
Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => {
if (rv) {
@@ -1115,7 +1119,9 @@ export default defineComponent({
_this.store.commit("setWorkspace", rv);
}
})
_this.confirmDeletePic(data,index)
console.log(newData);
_this.confirmDeletePic('',index,newData)
},
onCancel(){
@@ -1386,6 +1392,8 @@ export default defineComponent({
id:rv.id,
status:'Success',
})
console.log(this.generateList);
this.isShowMark = false
}
}).catch(()=>{