2023-11-6-1

This commit is contained in:
X1627315083
2023-11-06 15:19:52 +08:00
parent 19a163c674
commit 845da1b127
21 changed files with 262 additions and 88 deletions

View File

@@ -259,14 +259,12 @@ export default defineComponent({
hex = '#FFFFFF'
}
this.selectIndex = index
this.selectColor = color?.r ? {rgba:{r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1},hex:hex} : {}
// this.fileList = []
this.tcxColor = ''
this.pantongName = ''
this.pantongNameList = []
// this.selectColorList= []
this.reviewColor= {}
this.getColorBg = false
// this.selectColor = color?.r ? {rgba:{r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1},hex:hex} : {}
},
//通过tcx获取颜色

View File

@@ -69,10 +69,11 @@
:before-upload="beforeUpload"
v-model:file-list="fileList"
multiple
:maxCount="8 - moodboarList.length+fileList.length"
:maxCount="8 - moodboarList.length+fileList.length"
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => fileUploadChange(file)"
>
<div
class="upload_tip_block"
v-show=" moodboarList.length < 8"
@@ -84,6 +85,10 @@
</div>
</div>
</div>
<div class="upload_max_tip">
<span class="icon iconfont icon-zhuyi"></span>
<span>{{ $t('MoodboardUpload.Maximum') }}</span>
</div>
<!-- <div class="upload_max_tip">
<span class="icon iconfont icon-zhuyi"></span>
<span
@@ -536,6 +541,8 @@ export default defineComponent({
height: 30rem;
overflow-x: hidden;
border-right: 1px solid #e5e5e5;
display: flex;
flex-direction: column;
&.moodboard_body::-webkit-scrollbar {
display: none;
}
@@ -592,6 +599,7 @@ export default defineComponent({
margin: 0 1rem 1rem 0;
position: relative;
cursor: pointer;
overflow: hidden;
img{
width: auto;
height: 100%;

View File

@@ -78,6 +78,10 @@
</div>
</div>
</div>
<div class="upload_max_tip">
<span class="icon iconfont icon-zhuyi"></span>
<span>{{ $t('PrintboardUpload.Maximum') }}</span>
</div>
</div>
<Material v-show="openClick == 2" ref="Material" msg="Printboard" @confirmSelect="confirmSelect"></Material>
<Generate v-show="openClick == 3" ref="Generate" msg="Printboard" @generateCheckbox="getgenerateCheckbox"></Generate>
@@ -638,6 +642,8 @@ export default defineComponent({
}
.printboard_body{
display: flex;
flex-direction: column;
// height: calc(100% - 5rem);
flex: 1;
padding-top: 2.5rem;
@@ -726,6 +732,18 @@ export default defineComponent({
}
}
}
.upload_max_tip {
display: flex;
align-items: center;
justify-content: center;
font-size: 1.4rem;
color: #030303;
.icon-zhuyi {
font-size: 1.6rem;
margin-right: 0.7rem;
}
}
}
}
.delete_like_file_block{
@@ -788,6 +806,7 @@ export default defineComponent({
position: relative;
cursor: pointer;
text-align: center;
overflow: hidden;
img{
width: auto;
height: 100%;

View File

@@ -138,6 +138,10 @@
</div>
</div>
</div>
<div class="upload_max_tip">
<span class="icon iconfont icon-zhuyi"></span>
<span>{{ $t('SketchboardUpload.Maximum') }}</span>
</div>
</div>
<Material
@@ -700,12 +704,14 @@ export default defineComponent({
}
}
.sketchboard_body {
// height: calc(100% - 5rem);
flex: 1;
padding-top: 2.5rem;
height: 30rem;
overflow-x: hidden;
border-right: 1px solid #e5e5e5;
// height: calc(100% - 5rem);
flex: 1;
padding-top: 2.5rem;
height: 30rem;
overflow-x: hidden;
border-right: 1px solid #e5e5e5;
display: flex;
flex-direction: column;
&.moodboard_body::-webkit-scrollbar {
display: none;
}
@@ -783,7 +789,18 @@ export default defineComponent({
}
}
.upload_max_tip {
display: flex;
align-items: center;
justify-content: center;
font-size: 1.4rem;
color: #030303;
.icon-zhuyi {
font-size: 1.6rem;
margin-right: 0.7rem;
}
}
}
}
.delete_like_file_block{
@@ -847,6 +864,7 @@ export default defineComponent({
position: relative;
text-align: center;
cursor: pointer;
overflow: hidden;
img{
// width: 100%;
width: auto;