部分页面调整

This commit is contained in:
X1627315083
2024-06-17 11:32:31 +08:00
parent 363b880276
commit 9b8134989d
19 changed files with 192 additions and 106 deletions

View File

@@ -94,11 +94,11 @@
<i class="fi fi-rr-edit" @click.stop="openCurrent(2)"></i>
</div>
<div class="Guide_1_20 clothes_item_icon" :class="[driver__.driver?'showEvents':'']">
<div class="centent_div centent_print" v-if="current?.printObject?.prints?.[0]?.path && current?.printObject?.prints.length > 1" @click="openCurrent(2)">
<img v-for="item in current?.printObject?.prints" :key="item.id" :src="item.path" alt="">
<div class="centent_div centent_print" v-if="exhibitionList.print && exhibitionList.print.length > 1" @click="openCurrent(2)">
<img v-for="item in exhibitionList.print" :key="item.id" :src="item.path" alt="">
</div>
<div v-else-if="current?.printObject?.prints?.[0]?.path && current?.printObject?.prints.length == 1" class="centent_div">
<img :src="current?.printObject?.prints[0]?.path" alt="">
<div v-else-if="exhibitionList.print && exhibitionList.print.length == 1" class="centent_div">
<img :src="exhibitionList.print[0]?.path" alt="">
</div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(2)"></i>
</div>
@@ -130,7 +130,13 @@
<!-- <div class="centent_div" v-if="current?.printObject?.prints?.[0]?.path" @click="openCurrent(2)">
<img :src="current?.printObject?.prints[0]?.path" alt="">
</div> -->
<i class="fi fi-rr-picture centent" @click="openCurrent(4)"></i>
<div class="centent_div centent_print" v-if="exhibitionList.elements && exhibitionList.elements.length > 1" @click="openCurrent(4)">
<img v-for="item in exhibitionList.elements" :key="item.id" :src="item.path" alt="">
</div>
<div v-else-if="exhibitionList.elements && exhibitionList.elements.length == 1" class="centent_div">
<img :src="exhibitionList.elements[0]?.path" alt="">
</div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(4)"></i>
</div>
</div>
</div>
@@ -230,7 +236,7 @@ export default defineComponent({
provide('body',body)
let moible:any = isMoible()
provide('moible',moible)
let exhibitionList = ref({
let exhibitionList:any = ref({
print:[],
elements:[],
})
@@ -1458,6 +1464,9 @@ export default defineComponent({
flex-wrap: wrap;
justify-content: space-between;
align-content: space-between;
max-height: 10rem;
overflow-y: auto;
&.centent_print::-webkit-scrollbar{display: none;}
img{
width: 30%;
height: 30%;

View File

@@ -510,7 +510,7 @@ export default defineComponent({
// console.log(JSON.parse(JSON.stringify(this.colorList)),JSON.parse(JSON.stringify(newVal)));
clearInterval(this.getPantongNameTime)
this.getPantongNameTime = setTimeout(() => {
this.getPantongName(newVal.rgba)
this.getPantongName(newVal.rgba,-1)
}, 100);
},
immediate: true
@@ -1021,7 +1021,7 @@ export default defineComponent({
},
//查询颜色的潘通值和txc
getPantongName(v) {
getPantongName(v,index) {
if(v?.r == undefined){
return
}
@@ -1036,8 +1036,13 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.getRgbByHsvBatch, data)
.then((rv) => {
if (rv) {
this.colorList[this.selectIndex].tcx = rv[0].tcx
this.colorList[this.selectIndex].name = rv[0].name
if(index == -1){
this.colorList[this.selectIndex].tcx = rv[0].tcx
this.colorList[this.selectIndex].name = rv[0].name
}else{
this.colorList[index].tcx = rv[0].tcx
this.colorList[index].name = rv[0].name
}
resolve();
}
})
@@ -1114,7 +1119,18 @@ export default defineComponent({
});
this.selectColorList = selectColorList
// this.getHsvColor(selectColorList)
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
// this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
let colorListIndex = []
this.colorList.forEach((item,index)=>{
if(!item.rgba){
colorListIndex.push(index)
}
})
for (let index = 0; index < selectColorList.length; index++) {
this.colorList[colorListIndex[0]] = selectColorList[index]
this.getPantongName(selectColorList[index].rgba,colorListIndex[0])
colorListIndex.splice(0,1)
}
img.remove()
};