fix
This commit is contained in:
@@ -530,7 +530,8 @@ export default defineComponent({
|
|||||||
methods: {
|
methods: {
|
||||||
setUserData(item:any){
|
setUserData(item:any){
|
||||||
this.productimgSearchName = item.prompt
|
this.productimgSearchName = item.prompt
|
||||||
this.productimgSimilarity = 100 - item.imageStrength * 100
|
this.productimgSimilarity = (100 - item.imageStrength * 100) * 100 / 70
|
||||||
|
|
||||||
this.productimgRelightDirection = item.direction
|
this.productimgRelightDirection = item.direction
|
||||||
// let list = this.speedTypeList.toPorductImg
|
// let list = this.speedTypeList.toPorductImg
|
||||||
if(this.speedList.length == 0)return
|
if(this.speedList.length == 0)return
|
||||||
|
|||||||
@@ -219,6 +219,10 @@ props:{
|
|||||||
type:String,
|
type:String,
|
||||||
default:''
|
default:''
|
||||||
},
|
},
|
||||||
|
onlike:{
|
||||||
|
type:Function,
|
||||||
|
default:()=>{},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
emits:['addGenerateImg','upDataDesignLikeList'],
|
emits:['addGenerateImg','upDataDesignLikeList'],
|
||||||
setup(props:any,{emit}) {
|
setup(props:any,{emit}) {
|
||||||
@@ -316,13 +320,14 @@ setup(props:any,{emit}) {
|
|||||||
let remPrductimgTime:any = null
|
let remPrductimgTime:any = null
|
||||||
let prductimgTime:any = null
|
let prductimgTime:any = null
|
||||||
const getData = ()=>{
|
const getData = ()=>{
|
||||||
console.log(productimg.scaleImageList[productimg.scaleImageIndex])
|
console.log(productimg.scaleImageList[productimg.scaleImageIndex],productimg.selectGenerate)
|
||||||
let obj = null as any
|
let obj = null as any
|
||||||
if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'ToProductImage'){
|
if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'ToProductImage'){
|
||||||
obj = {
|
obj = {
|
||||||
elementId:productimg.scaleImageList[productimg.scaleImageIndex].designOutfitId||productimg.scaleImageList[productimg.scaleImageIndex].elementId,
|
elementId:productimg.scaleImageList[productimg.scaleImageIndex].designOutfitId||productimg.scaleImageList[productimg.scaleImageIndex].elementId,
|
||||||
elementType:'DesignOutfit',
|
elementType:'DesignOutfit',
|
||||||
parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId,
|
parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId,
|
||||||
|
// userLikeSortId:productimg.selectGenerate.userLikeSortId || null,
|
||||||
userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null,
|
userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null,
|
||||||
}
|
}
|
||||||
if(productimg.scaleImageList[productimg.scaleImageIndex]?.relationType == "Design"){
|
if(productimg.scaleImageList[productimg.scaleImageIndex]?.relationType == "Design"){
|
||||||
@@ -334,6 +339,7 @@ setup(props:any,{emit}) {
|
|||||||
elementType:'ToProductImage',
|
elementType:'ToProductImage',
|
||||||
parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId,
|
parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId,
|
||||||
userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null,
|
userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null,
|
||||||
|
// userLikeSortId:productimg.selectGenerate.userLikeSortId || null,
|
||||||
}
|
}
|
||||||
}else if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'PoseTransfer'){
|
}else if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'PoseTransfer'){
|
||||||
|
|
||||||
@@ -401,6 +407,9 @@ setup(props:any,{emit}) {
|
|||||||
data = getPoseTransformData()
|
data = getPoseTransformData()
|
||||||
}
|
}
|
||||||
productimg.productimgIsProductimg = true
|
productimg.productimgIsProductimg = true
|
||||||
|
if(productimg.openType != 'add'){
|
||||||
|
await props.onlike(null,null,productimg.selectGenerate.listType,'onLike')
|
||||||
|
}
|
||||||
// setPrductimg([{taskId:"f785fbbf-425c-4d9b-b4d0-0f38f480c64e-83"}])
|
// setPrductimg([{taskId:"f785fbbf-425c-4d9b-b4d0-0f38f480c64e-83"}])
|
||||||
// return
|
// return
|
||||||
Https.axiosPost(url, data).then(
|
Https.axiosPost(url, data).then(
|
||||||
@@ -420,13 +429,14 @@ setup(props:any,{emit}) {
|
|||||||
rv.forEach((item:any)=>{
|
rv.forEach((item:any)=>{
|
||||||
arr.push(item.taskId)
|
arr.push(item.taskId)
|
||||||
})
|
})
|
||||||
|
console.log(productimg.selectGenerate)
|
||||||
productimg.generateCourse = {
|
productimg.generateCourse = {
|
||||||
...rv[0],
|
...rv[0],
|
||||||
prompt:productimg.productimgSearchName,
|
prompt:productimg.productimgSearchName,
|
||||||
parentId:productimg.selectGenerate?.parentId || productimg.selectGenerate.userLikeGroupId,
|
parentId:productimg.selectGenerate?.parentId || productimg.selectGenerate.userLikeGroupId,
|
||||||
modelName:speed.speedData.value,
|
modelName:speed.speedData.value,
|
||||||
poseId:productimg.selectPose,
|
poseId:productimg.selectPose,
|
||||||
userLikeSortId:productimg.selectGenerate?.parentId || productimg.selectGenerate.userLikeGroupId,
|
userLikeSortId:productimg.selectGenerate.userLikeSortId || productimg.selectGenerate?.parentId,
|
||||||
sourceUrl:productimg.selectGenerate?.sourceUrl || productimg.selectGenerate?.productImage,
|
sourceUrl:productimg.selectGenerate?.sourceUrl || productimg.selectGenerate?.productImage,
|
||||||
status:null,
|
status:null,
|
||||||
oldId:productimg.openType == 'add'?null:productimg.selectGenerate.id,
|
oldId:productimg.openType == 'add'?null:productimg.selectGenerate.id,
|
||||||
@@ -548,7 +558,8 @@ setup(props:any,{emit}) {
|
|||||||
const setUserData = (item:any)=>{
|
const setUserData = (item:any)=>{
|
||||||
productimg.productimgSearchName = item.prompt
|
productimg.productimgSearchName = item.prompt
|
||||||
productimg.productimgBrightenValue = item.brightenValue
|
productimg.productimgBrightenValue = item.brightenValue
|
||||||
productimg.productimgSimilarity = 100 - item.imageStrength * 100
|
// productimg.productimgSimilarity = 100 - item.imageStrength * 100
|
||||||
|
productimg.productimgSimilarity = (100 - item.imageStrength * 100) * 100 / 70
|
||||||
productimg.productimgRelightDirection = item.direction
|
productimg.productimgRelightDirection = item.direction
|
||||||
if(item.poseId){
|
if(item.poseId){
|
||||||
let index = 0;
|
let index = 0;
|
||||||
@@ -698,7 +709,8 @@ setup(props:any,{emit}) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
let emitData = {
|
let emitData = {
|
||||||
status:productimg.openType,
|
status:'add',
|
||||||
|
// status:productimg.openType,
|
||||||
addList:[{
|
addList:[{
|
||||||
...productimg.generateCourse,
|
...productimg.generateCourse,
|
||||||
}]
|
}]
|
||||||
|
|||||||
@@ -306,7 +306,6 @@
|
|||||||
<div class="mark_loading" v-show="isShowMark">
|
<div class="mark_loading" v-show="isShowMark">
|
||||||
<a-spin size="large" />
|
<a-spin size="large" />
|
||||||
</div>
|
</div>
|
||||||
{{ designTools.designTools }}123
|
|
||||||
|
|
||||||
<!-- 导出缩略图的蒙层 end-->
|
<!-- 导出缩略图的蒙层 end-->
|
||||||
<!-- design collection的进度蒙层 start-->
|
<!-- design collection的进度蒙层 start-->
|
||||||
@@ -316,6 +315,7 @@
|
|||||||
<editDesignType ref="editDesignType"
|
<editDesignType ref="editDesignType"
|
||||||
@addGenerateImg="addGenerateImg"
|
@addGenerateImg="addGenerateImg"
|
||||||
@upDataDesignLikeList="generateLoad"
|
@upDataDesignLikeList="generateLoad"
|
||||||
|
:onlike="setNoDesignLike"
|
||||||
:productData="{
|
:productData="{
|
||||||
upload:upload,
|
upload:upload,
|
||||||
RelightDirection:RelightDirection,
|
RelightDirection:RelightDirection,
|
||||||
@@ -907,6 +907,11 @@ export default defineComponent({
|
|||||||
arr[index].sort = arr[index].oldSort || arr[index].sort
|
arr[index].sort = arr[index].oldSort || arr[index].sort
|
||||||
console.log(JSON.parse(JSON.stringify(arr[index])))
|
console.log(JSON.parse(JSON.stringify(arr[index])))
|
||||||
dataDom.editDesignType.init(arr,index,null,status,listType)
|
dataDom.editDesignType.init(arr,index,null,status,listType)
|
||||||
|
if(item != 'Design'){
|
||||||
|
designData.selectDesign = designData.selectLikeDesign.filter((item:any)=>(item.resultType == 'Design' && item.userLikeSortId == designData.selectLikeDesign[index].parentId))[0]
|
||||||
|
}else{
|
||||||
|
designData.selectDesign = designData.selectLikeDesign[index]
|
||||||
|
}
|
||||||
dataDom.editDesignType.isLike = false
|
dataDom.editDesignType.isLike = false
|
||||||
// dataDom.editDesignType.productimgRelightDirection = editDesignType.RelightDirection
|
// dataDom.editDesignType.productimgRelightDirection = editDesignType.RelightDirection
|
||||||
dataDom.editDesignType.isComparison = true
|
dataDom.editDesignType.isComparison = true
|
||||||
@@ -922,10 +927,12 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
const setNoDesignLike = (design:any,index:any,type:any,str:string) => {
|
const setNoDesignLike = (design:any,index:any,type:any,str:string) => {
|
||||||
let url
|
let url
|
||||||
|
let designItem = design || designData.selectEditBtn
|
||||||
|
console.log(designItem,designData?.selectDesign)
|
||||||
let data = {
|
let data = {
|
||||||
toProductImageResultId:[(design.designItemId || design.id)],
|
toProductImageResultId:[(designItem.designItemId || designItem.id)],
|
||||||
projectId: store.state.Workspace.probjects.id,
|
projectId: store.state.Workspace.probjects.id,
|
||||||
collectionSortParentId:designData?.selectDesign?.parentId || design?.parentId,
|
collectionSortParentId:designData?.selectDesign?.parentId || designItem?.parentId,
|
||||||
} as any
|
} as any
|
||||||
let params = {} as any
|
let params = {} as any
|
||||||
if(type == 'ToProductImage' || type == 'Relight'){
|
if(type == 'ToProductImage' || type == 'Relight'){
|
||||||
@@ -939,16 +946,16 @@ export default defineComponent({
|
|||||||
if(str == 'like'){
|
if(str == 'like'){
|
||||||
params = {
|
params = {
|
||||||
likeOrDislike:'like',
|
likeOrDislike:'like',
|
||||||
transformedId:design.id,
|
transformedId:designItem.id,
|
||||||
projectId:store.state.Workspace.probjects.id,
|
projectId:store.state.Workspace.probjects.id,
|
||||||
collectionSortParentId:design.parentId || designData?.selectDesign?.userLikeSortId,
|
collectionSortParentId:designItem.parentId || designData?.selectDesign?.userLikeSortId,
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
params = {
|
params = {
|
||||||
likeOrDislike:'dislike',
|
likeOrDislike:'dislike',
|
||||||
transformedId:design.id,
|
transformedId:designItem.id,
|
||||||
projectId:store.state.Workspace.probjects.id,
|
projectId:store.state.Workspace.probjects.id,
|
||||||
collectionSortParentId:design.parentId || designData?.selectDesign?.userLikeSortId,
|
collectionSortParentId:designItem.parentId || designData?.selectDesign?.userLikeSortId,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
@@ -967,11 +974,11 @@ export default defineComponent({
|
|||||||
if(item.resultType == 'Design' && item.userLikeSortId == designData.selectDesign.userLikeSortId){
|
if(item.resultType == 'Design' && item.userLikeSortId == designData.selectDesign.userLikeSortId){
|
||||||
if(!item?.childList)item.childList = []
|
if(!item?.childList)item.childList = []
|
||||||
// if(item?.childList)
|
// if(item?.childList)
|
||||||
const removeIndex = item?.childList.findIndex(childItem => childItem?.taskId === design?.taskId);
|
const removeIndex = item?.childList.findIndex(childItem => childItem?.taskId === designItem?.taskId);
|
||||||
if (removeIndex !== -1) {
|
if (removeIndex !== -1) {
|
||||||
item.childList[removeIndex] = design
|
item.childList[removeIndex] = designItem
|
||||||
}else{
|
}else{
|
||||||
item.childList.push(design)
|
item.childList.push(designItem)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -979,12 +986,12 @@ export default defineComponent({
|
|||||||
likeDesignCollectionList.value.forEach((item:any)=>{
|
likeDesignCollectionList.value.forEach((item:any)=>{
|
||||||
if(item.resultType == 'Design' && item.userLikeSortId == designData.selectDesign.userLikeSortId){
|
if(item.resultType == 'Design' && item.userLikeSortId == designData.selectDesign.userLikeSortId){
|
||||||
item.childList.forEach((childItem:any)=>{
|
item.childList.forEach((childItem:any)=>{
|
||||||
if(childItem.sort > design.oldSort){
|
if(childItem.sort > designItem.oldSort){
|
||||||
childItem.sort -= 1
|
childItem.sort -= 1
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
item.childList = item.childList.filter((childItem:any)=>{
|
item.childList = item.childList.filter((childItem:any)=>{
|
||||||
return childItem.id != design.id
|
return childItem.id != designItem.id
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -1080,8 +1087,6 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
const generateLoad = async (data:any)=>{
|
const generateLoad = async (data:any)=>{
|
||||||
// return
|
// return
|
||||||
console.log(JSON.parse(JSON.stringify(data)))
|
|
||||||
|
|
||||||
let list = likeDesignCollectionList.value
|
let list = likeDesignCollectionList.value
|
||||||
//添加元素
|
//添加元素
|
||||||
if(data.addList){
|
if(data.addList){
|
||||||
@@ -2137,6 +2142,7 @@ export default defineComponent({
|
|||||||
if(this.isMove)return
|
if(this.isMove)return
|
||||||
this.store.commit('setOpenChatStatus',false)
|
this.store.commit('setOpenChatStatus',false)
|
||||||
if(design.resultType != "Design"){
|
if(design.resultType != "Design"){
|
||||||
|
this.selectEditBtn = design
|
||||||
this.setEditDesignType(collectionList,index,design.resultType,'edit',type)
|
this.setEditDesignType(collectionList,index,design.resultType,'edit',type)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -242,10 +242,15 @@ export default defineComponent({
|
|||||||
left: 50%;
|
left: 50%;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
transform: translate(-50%,-50%);
|
transform: translate(-50%,-50%);
|
||||||
|
text-align: center;
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
> img{
|
> img{
|
||||||
width: 17rem;
|
width: 17rem;
|
||||||
}
|
}
|
||||||
|
> .text{
|
||||||
|
width: max-content;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
font-size: 1.8rem;
|
font-size: 1.8rem;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
display: block;
|
display: block;
|
||||||
|
|||||||
Reference in New Issue
Block a user