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

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

Browse Source
This commit is contained in:
X1627315083
2025-10-07 11:14:07 +08:00
parent 6a71ec8cee 40aa1d6d25
commit 0fa50cc6ae
10 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/component/home/tools/poseTransfer/index.vue
View File

@@ -450,7 +450,6 @@ export default defineComponent({
str:'add',
list:[file]
}
console.log(1111)
store.commit('setUploadElement',storeData)
}else{
bor = false

27
src/component/home/tools/toProduct/index.vue
View File

@@ -46,7 +46,6 @@
:headers="{ Authorization: token }"
:before-upload="beforeUpload"
:multiple="!!upload.projectId"
v-model:file-list="fileList[productimgMenu.value]"
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => fileUploadChange(file)"
>
@@ -82,16 +81,16 @@
<!-- <div v-show="productimgMenu.value == 'Relight'" class="productImg_content_item_Direction generalModel_state_item">
<a-select size="large" style="width: 100%;" v-model:value="speedData.value" :options="speedList" :field-names="{ label: 'relightLabel', value: 'value' }"></a-select>
</div> -->
<div v-show="productimgMenu.value == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_title productImg_content_item_title_similarity">
<div v-show="productimgMenu.value == 'Relight' && !(speedData.value == 'advanced' || speedData.value == 'flux')" class="productImg_content_item_title productImg_content_item_title_similarity">
<span>{{$t('ProductImg.RelightDirection')}}</span>
</div>
<div v-show="productimgMenu.value == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_Direction generalModel_state_item">
<div v-show="productimgMenu.value == 'Relight' && !(speedData.value == 'advanced' || speedData.value == 'flux')" class="productImg_content_item_Direction generalModel_state_item">
<a-select size="large" style="width: 100%;" v-model:value="RelightDirection" :options="RelightDirectionList"></a-select>
</div>
<div v-show="productimgMenu.value == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_title productImg_content_item_title_similarity">
<div v-show="productimgMenu.value == 'Relight' && !(speedData.value == 'advanced' || speedData.value == 'flux')" class="productImg_content_item_title productImg_content_item_title_similarity">
<span>{{$t('ProductImg.Highlight')}}</span>
</div>
<div v-show="productimgMenu.value == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_similarity">
<div v-show="productimgMenu.value == 'Relight' && !(speedData.value == 'advanced' || speedData.value == 'flux')" class="productImg_content_item_similarity">
<a-slider class="system_silder"
v-model:value="brightenValue"
:tooltipVisible="false"
@@ -131,7 +130,7 @@
<i class="fi fi-bs-magic-wand" style="background-color: #000; font-size: 2.3rem; flex: 1;margin: 0;" @click="getPrductimg"></i>
<div v-show="productimgMenu.value != 'Relight'" class="icon iconfont icon-xiala" :class="{active:speedState}" @click.stop="openSpeed"></div>
<div class="content" v-show="speedState">
<div v-for="item in speedList" :key="item.value" :class="{active:productimgMenu.value == 'ToProductImage'?item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
</div>
</div>
<div v-show="isProductimg" class="generage_btn started_btn" @click="getPrductimg">
@@ -296,7 +295,7 @@ export default defineComponent({
title:'',
label:t('speedList.toproductFlus'),
relightLabel:t('speedList.relightEdit'),
value:'flux',
value:'advanced',
},{
title:'',
label:t('speedList.toproductBasic'),
@@ -307,9 +306,9 @@ export default defineComponent({
speedState:false,
speedData:{
title:'',
label:'FLUX',
relightLabel:'Edit',
value:'flux',
label:t('speedList.toproductFlus'),
relightLabel:t('speedList.relightEdit'),
value:'advanced',
},
})
@@ -426,6 +425,7 @@ export default defineComponent({
}
let fileUploadChange = (data: any)=> {
console.log(data)
let file = data.file;
let bor = true
if (file.status === "done") {
@@ -472,7 +472,8 @@ export default defineComponent({
CollectionType:props.productimgMenu.value,
}
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
console.log(!!((isJpgOrPng && isLt2M && productImgData.selectObject.id) || Upload.LIST_IGNORE))
return !!((isJpgOrPng && isLt2M && productImgData.selectObject.id) || Upload.LIST_IGNORE);
}
let setGenerate = (item:any)=>{
item.isChecked = !item.isChecked
@@ -583,7 +584,7 @@ export default defineComponent({
toProductImageVOList:selectArr,
// userLikeGroupId:upload.value.userlikeGroupId,
projectId:productImgData.selectObject.id,
modelName:speed.speedData.value,
modelName:obj.elementType == 'Relight'?'flux':speed.speedData.value,
direction:RelightDirection.value,
brightenValue:productImgData.brightenValue,
imageStrength:(100 - imageStrength)/100,
@@ -659,7 +660,7 @@ export default defineComponent({
let index = productImgData.generateList[props.productimgMenu.value].findIndex((obj:any) => obj.taskId === element.taskId);
productImgData.generateList[props.productimgMenu.value][index] = {
...element,
modelName:speed.speedData.value,
modelName:props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value,
}
// productImgData.generateList[props.productimgMenu.value].unshift(element)
data = data.filter((item:any) => item !== element.taskId);