fix
This commit is contained in:
@@ -609,21 +609,33 @@ export default defineComponent({
|
|||||||
this.clothesList = []
|
this.clothesList = []
|
||||||
this.getLibraryList()
|
this.getLibraryList()
|
||||||
}else{
|
}else{
|
||||||
|
let rgba = {
|
||||||
|
r:this.current.color.r+"",
|
||||||
|
g:this.current.color.g+"",
|
||||||
|
b:this.current.color.b+"",
|
||||||
|
a:1
|
||||||
|
}
|
||||||
|
let ind = 0
|
||||||
this.store.state.UploadFilesModule.allBoardData?.colorBoards?.forEach((item,index) => {
|
this.store.state.UploadFilesModule.allBoardData?.colorBoards?.forEach((item,index) => {
|
||||||
this.colorList[index+1] = {
|
console.log(JSON.stringify(rgba) , JSON.stringify(item.rgbValue));
|
||||||
|
if(JSON.stringify(rgba) == JSON.stringify(item.rgbValue)){
|
||||||
|
ind+=1
|
||||||
|
}else{
|
||||||
|
this.colorList[index+1 - ind] = {
|
||||||
gradient:item.gradient,
|
gradient:item.gradient,
|
||||||
rgba:item.rgbValue,
|
rgba:item.rgbValue,
|
||||||
tcx:item.tcx,
|
tcx:item.tcx,
|
||||||
name:item.name,
|
name:item.name,
|
||||||
}
|
}
|
||||||
if(item.gradient){
|
if(item.gradient){
|
||||||
this.colorList[index+1].gradient = item.gradient
|
this.colorList[index+1 - ind].gradient = item.gradient
|
||||||
}else{
|
}else{
|
||||||
delete this.colorList[index+1].gradient
|
delete this.colorList[index+1 - ind].gradient
|
||||||
}
|
}
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
let DesignDetailEnd = this.$refs.DesignDetailEnd
|
let DesignDetailEnd = this.$refs.DesignDetailEnd
|
||||||
DesignDetailEnd.init(num)
|
DesignDetailEnd.init(num)
|
||||||
this.workspaceCom = computed(()=>{
|
this.workspaceCom = computed(()=>{
|
||||||
|
|||||||
@@ -91,6 +91,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-show="type_ == 1 || type_ == 3" @click.stop="setPreview" class="subitOkPreviewBtn" :class="[ !sketchImg?.id?!current?.id?'active':'':'' ]">{{ $t('DesignDetailEnd.preview') }}</div>
|
<div v-show="type_ == 1 || type_ == 3" @click.stop="setPreview" class="subitOkPreviewBtn" :class="[ !sketchImg?.id?!current?.id?'active':'':'' ]">{{ $t('DesignDetailEnd.preview') }}</div>
|
||||||
|
|
||||||
|
<div v-if="type_ == 2 && (current?.printObject?.prints?.length != 0 || exhibitionList.print.length != 0)" @click.stop="setPreview('clearPrint')" class="subitOkPreviewBtn clear">{{ $t('Habit.Clear') }}</div>
|
||||||
<div v-if="type_ == 2 && (current?.printObject?.prints?.length != 0 || printsList.length != 0 || exhibitionList.print.length != 0)" @click.stop="setPrint" class="subitOkPreviewBtn Guide_1_23">{{ $t('DesignDetailEnd.Layout') }}</div>
|
<div v-if="type_ == 2 && (current?.printObject?.prints?.length != 0 || printsList.length != 0 || exhibitionList.print.length != 0)" @click.stop="setPrint" class="subitOkPreviewBtn Guide_1_23">{{ $t('DesignDetailEnd.Layout') }}</div>
|
||||||
<!-- <div v-else-if="type_ == 2 && designItemDetail?.clothes?.[currentIndex]?.printObject?.prints?.[0]?.path != null && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div> -->
|
<!-- <div v-else-if="type_ == 2 && designItemDetail?.clothes?.[currentIndex]?.printObject?.prints?.[0]?.path != null && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div> -->
|
||||||
<div v-if="type_ == 4 && (elementsList.length != 0 || exhibitionList.elements.length != 0)" @click.stop="setElemets" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.Layout') }}</div>
|
<div v-if="type_ == 4 && (elementsList.length != 0 || exhibitionList.elements.length != 0)" @click.stop="setElemets" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.Layout') }}</div>
|
||||||
@@ -352,7 +354,7 @@ export default defineComponent({
|
|||||||
DesignElementsOperation.init()
|
DesignElementsOperation.init()
|
||||||
},
|
},
|
||||||
//提交
|
//提交
|
||||||
setPreview(){
|
setPreview(str){
|
||||||
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
|
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
|
||||||
let index
|
let index
|
||||||
let data = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designPreviewData))
|
let data = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designPreviewData))
|
||||||
@@ -385,7 +387,9 @@ export default defineComponent({
|
|||||||
data.designSingleItemDTOList[index].path =this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath
|
data.designSingleItemDTOList[index].path =this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath
|
||||||
data.designSingleItemDTOList[index].type =this.sketchImg.type? this.sketchImg.type: this.current.type
|
data.designSingleItemDTOList[index].type =this.sketchImg.type? this.sketchImg.type: this.current.type
|
||||||
}else if(this.type_ == 2){
|
}else if(this.type_ == 2){
|
||||||
|
if(str == 'clearPrint'){
|
||||||
data.designSingleItemDTOList[index].printObject.prints = []
|
data.designSingleItemDTOList[index].printObject.prints = []
|
||||||
|
}
|
||||||
}else if(this.type_ == 3){
|
}else if(this.type_ == 3){
|
||||||
if(this.colorList[this.selectIndex]?.rgba?.r == undefined){
|
if(this.colorList[this.selectIndex]?.rgba?.r == undefined){
|
||||||
message.info(this.t('DesignDetailEnd.jsContent2'))
|
message.info(this.t('DesignDetailEnd.jsContent2'))
|
||||||
@@ -702,8 +706,11 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.subitOkPreviewBtn{
|
.subitOkPreviewBtn{
|
||||||
bottom: calc(4rem*1.2);
|
bottom: calc(3rem*1.2);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
&.clear{
|
||||||
|
bottom: calc(7rem);
|
||||||
|
}
|
||||||
&.active{
|
&.active{
|
||||||
opacity: .5;
|
opacity: .5;
|
||||||
pointer-events:none;
|
pointer-events:none;
|
||||||
|
|||||||
Reference in New Issue
Block a user