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

Merge remote-tracking branch 'origin/StableVersion' into localDevelop

Browse Source
This commit is contained in:
X1627315083
2024-05-20 14:49:03 +08:00
parent baae4657bf 3c51d3fe85
commit cfcf70c65c
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/component/Detail/DesignDetail.vue
View File

@@ -38,13 +38,14 @@
</div> </div>
</div> </div>
<div class="detail_modal_model_content" :class="{active:body}"> <div class="detail_modal_model_content" :class="{active:body}">
<div class="detail_modal_item_back" :class="{active:body}" v-for="item,index in frontBack.back" :style="item.style"> <img class="detail_modal_model" :src="designItemDetail.designItemUrl" alt="">
<!-- <div class="detail_modal_item_back" :class="{active:body}" v-for="item,index in frontBack.back" :style="item.style">
<img :src="item.imageUrl" alt=""> <img :src="item.imageUrl" alt="">
</div> </div> -->
<img class="detail_modal_model" :src="frontBack.body?.layersObject[0]?.imageUrl" alt=""> <!-- <img class="detail_modal_model" :src="frontBack.body?.layersObject[0]?.imageUrl" alt=""> -->
<div class="detail_modal_item_front Guide_1_19" :class="{active:body}" v-for="item,index in frontBack.front" :style="item.style" @click.stop="clothesOpen(index)"> <!-- <div class="detail_modal_item_front Guide_1_19" :class="{active:body}" v-for="item,index in frontBack.front" :style="item.style" @click.stop="clothesOpen(index)">
<img :src="item.imageUrl" alt=""> <img :src="item.imageUrl" alt="">
</div> </div> -->
</div> </div>
</div> </div>
@@ -427,7 +428,7 @@ export default defineComponent({
this.designItemId = data.design.designItemId this.designItemId = data.design.designItemId
this.designOutfitId = data.design.designOutfitId this.designOutfitId = data.design.designOutfitId
let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}` let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
// let url = Https.httpUrls.getDesignDetail + `?designItemId=45192&designPythonOutfitId=44898` // let url = Https.httpUrls.getDesignDetail + `?designItemId=40660&designPythonOutfitId=40366`
this.parentData = data this.parentData = data
this.loadingShow = true this.loadingShow = true
Https.axiosGet(url).then( Https.axiosGet(url).then(
@@ -1194,6 +1195,9 @@ export default defineComponent({
position: relative; position: relative;
width: auto; width: auto;
max-height: 100%; max-height: 100%;
top: 50%;
transform: translateY(-50%);
} }
&.active{ &.active{
width: 100%; width: 100%;

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

@@ -624,6 +624,7 @@ export default defineComponent({
//设置导出 //设置导出
let setExport = async () => { let setExport = async () => {
initAligningGuidelines(canvas,false)
var imageDataURL = canvas.toDataURL({ var imageDataURL = canvas.toDataURL({
format: "png", // 导出格式为 PNG format: "png", // 导出格式为 PNG
quality: 1, // 图片质量为 1（最高质量） quality: 1, // 图片质量为 1（最高质量）
@@ -722,10 +723,13 @@ export default defineComponent({
if(driver__.value.driver){ if(driver__.value.driver){
driverObj__.moveNext() driverObj__.moveNext()
} }
initAligningGuidelines(canvas,true)
}) })
.catch((res) => { .catch((res) => {
// message.warning(t('HomeView.jsContent3')); // message.warning(t('HomeView.jsContent3'));
isShowMark = false; isShowMark = false;
initAligningGuidelines(canvas,true)
}); });
}; };
//关闭画布 //关闭画布

2
src/lang/en.ts
View File

@@ -55,7 +55,7 @@ export default {
HDExport:'UpScale', HDExport:'UpScale',
Export:'Export', Export:'Export',
SR:'Please select the picture that requires upscale', SR:'Please select the picture that requires upscale',
requiresCredits:'Performing upscale image requires a {data} integral', requiresCredits:'Performing upscale image requires a {data} credits',
Scale:'Scale', Scale:'Scale',
Cancel:'Cancel', Cancel:'Cancel',
jsContent1:'Canvas edit content is not saved, whether to leave the page', jsContent1:'Canvas edit content is not saved, whether to leave the page',