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

Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
zhangyh
2025-09-16 15:41:46 +08:00
parent 7441973103 1183460db4
commit eabcc89dfe
27 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,14 +302,15 @@ export default defineComponent({
if(detailData.currentDetailType == 'sketch' && newData){
color = detailData.designDetail.clothes[0].color?.rgba?.r?`${detailData.designDetail.clothes[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
}
console.log(list[i])
let data:any = {
changed:false,
color,
designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType,
id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id,
maskMinioUrl:list[i]?.maskMinioUrl,
maskMinioUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskMinioUrl,
// maskUrl:'',
maskUrl:list[i].maskUrl,
maskUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskUrl,
// offset:[
// -233.13985,
// 406.90964

2
src/component/Detail/canvas/index.vue
View File

@@ -190,7 +190,7 @@ export default defineComponent({
})
}
const frontBackChange = (value:any)=>{
let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.frontBack.front[detailData.imgDomIndex].imageUrl
let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path
let size = {
...detailData.canvasConfig,
}

8
src/component/Detail/detailLeft/module/currentList.vue
View File

@@ -56,11 +56,13 @@ export default defineComponent({
})
const selectImgItem = (file:any)=>{
if(props.type != 'models'){
if(!file.resData.minIOPath){
file.minIOPath = getMinioUrl(file.imgUrl || file.resData.url)
if(!file.resData?.minIOPath){
file.minIOPath = getMinioUrl(file?.imgUrl || file?.resData?.url)
}else{
file.minIOPath = file.resData.minIOPath
}
if(!file.designType){
file.designType = file.resData.designType
file.designType = file?.resData?.designType
}
}
// store.commit('DesignDetail/setNewDetail',file.resData)

2
src/component/Detail/detailLeft/sketch.vue
View File

@@ -76,10 +76,10 @@ export default defineComponent({
selectImgItem(data)
return
}
data.id = id
if(data?.imgUrl)data.url = data.imgUrl
let value = {
data,
id,
}
if(detailData.currentDetailType == 'sketch'){
detailData.selectDetail.sketchString = ''

2
src/component/Detail/detailRight/editPrintElement.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="editPrintElement">
<div class="detailText" style="text-align: left; margin-bottom: 1rem;">
<div class="detailText" style="text-align: left; margin-bottom: 1rem;" v-if="type == 'print'">
{{ $t('DesignPrintOperation.ModifyPrint') }}
</div>
<div class="printOverallBtn" v-if="type == 'print'">

2
src/component/Detail/model/modelPosition.vue
View File

@@ -481,7 +481,7 @@ export default defineComponent({
align-items: center;
justify-content: center;
img{
height: auto;
// height: auto;
}
}
}