This commit is contained in:
X1627315083
2024-01-10 09:34:32 +08:00
parent fd4ed51bf5
commit 59c5e59347
25 changed files with 64 additions and 76 deletions

View File

@@ -772,7 +772,7 @@ i {
.collection_modal_body .upload_item .upload_file_item,
.design_detail_modal_component .upload_item .upload_file_item,
.library_page .upload_item .upload_file_item {
margin: 0 1rem 2rem 0;
margin: 0 2rem 2rem 0;
display: inline-block;
width: 10rem;
height: 10rem;

View File

@@ -866,7 +866,7 @@ i{
display: flex;
flex-wrap: wrap;
.upload_file_item {
margin: 0 1rem 2rem 0;
margin: 0 2rem 2rem 0;
display: inline-block;
// width: 16.5rem;
// height: 16.5rem;

View File

@@ -5,7 +5,7 @@
:class="[driver__.driver?'hideEvents':'']"
v-model:visible="designDetailShow"
:footer="null"
width="110rem"
width="65%"
:maskClosable="false"
:centered="true"
:keyboard="false"

View File

@@ -1052,7 +1052,7 @@ export default defineComponent({
// background: #FFFFFF;
border: 0.1rem solid #F1F1F1;
// font-size: 1.6rem;
font-size: 1.4rem;
font-size: 1.2rem;
font-weight: 400;
height: 3rem;
@@ -1125,8 +1125,6 @@ export default defineComponent({
vertical-align: top;
// padding: 0 1.4rem;
// margin-bottom: 2.8rem;
max-width: 48%;
margin-bottom: 2rem;
padding: 0;
// height: 9rem;
@@ -1141,7 +1139,6 @@ export default defineComponent({
}
.content_img_item_block{
// border: 0.1rem solid transparent;
max-width: 100%;
width: 10rem;
height: 10rem;
display: flex;
@@ -1310,7 +1307,7 @@ export default defineComponent({
}
.upload_file_item{
// margin: 0 1rem 2rem 0;
// margin: 0 2rem 2rem 0;
margin: 0;
display: inline-block;
// width: 16.5rem;
@@ -1679,7 +1676,7 @@ export default defineComponent({
display: flex;
justify-content: center;
.ant-upload-select-picture-card{
// margin: 0 1rem 2rem 0;
// margin: 0 2rem 2rem 0;
margin: 0;
display: inline-block;
width: 6rem;

View File

@@ -5,7 +5,7 @@
:class="[driver__.driver?'hideEvents':'']"
v-model:visible="designOpenrtion"
:footer="null"
width="110rem"
width="65%"
:maskClosable="false"
:centered="true"
:closable="false"

View File

@@ -5,7 +5,7 @@
v-model:visible="designOpenrtion"
:class="[driver__.driver?'hideEvents':'']"
:footer="null"
width="110rem"
width="65%"
:maskClosable="false"
:centered="true"
:closable="false"

View File

@@ -65,8 +65,8 @@ export default defineComponent({
.ant-modal-body{
background: #F2F3FB;
height: 70vh;
min-height: 62rem;
height: 80vh;
min-height: 72rem;
overflow-y: hidden;
padding: 0;
}

View File

@@ -608,7 +608,7 @@ export default defineComponent({
display: none;
}
.upload_file_item{
// margin: 0 1rem 2rem 0;
// margin: 0 2rem 2rem 0;
margin: 0;
display: inline-block;
// width: 16.5rem;
@@ -979,7 +979,7 @@ export default defineComponent({
.ant-upload-picture-card-wrapper{
.ant-upload-list{
.ant-upload-select-picture-card{
// margin: 0 1rem 2rem 0;
// margin: 0 2rem 2rem 0;
margin: 0;
display: inline-block;
width: 12rem;

View File

@@ -2,7 +2,7 @@
<a-modal class="modal_component cut_pricture_modal"
v-model:visible="cutPicuterModal"
:footer="null"
width="110rem"
width="65%"
:maskClosable="false"
:centered="true"
:closable="false"

View File

@@ -763,7 +763,7 @@ export default defineComponent({
}
.generate_checkbox {
div {
margin-right: 2rem;
margin-right: 4rem;
label {
display: flex;
cursor: pointer;
@@ -824,7 +824,7 @@ export default defineComponent({
flex: 1;
.generage_img_item {
cursor: pointer;
margin: 0 1rem 2rem 0;
margin: 0 2rem 2rem 0;
position: relative;
&.active {
opacity: 0.5;

View File

@@ -555,7 +555,7 @@ export default defineComponent({
// right: 3.2rem;
left: 0;
display: flex;
width: 35%;
width: 33%;
height: 100%;
align-items: center;
overflow: hidden;

View File

@@ -209,7 +209,7 @@ export default defineComponent({
}
.upload_file_item{
margin: 0 1rem 2rem 0;
margin: 0 2rem 2rem 0;
display: inline-block;
width: 16.5rem;
height: 16.5rem;

View File

@@ -428,7 +428,7 @@ export default defineComponent({
// background: #FFFFFF;
border: 0.1rem solid #F1F1F1;
// font-size: 1.6rem;
font-size: 1.4rem;
font-size: 1.2rem;
font-weight: 400;
height: 3rem;
@@ -536,7 +536,7 @@ export default defineComponent({
&.material_content_body::-webkit-scrollbar{display: none;}
.content_img_item{
margin: 0 1rem 5rem 0;
margin: 0 2rem 5rem 0;
display: inline-block;
width: 10rem;
height: 10rem;
@@ -550,7 +550,7 @@ export default defineComponent({
height: 100%;
}
&.moodb{
margin: 0 1rem 2rem 0;
margin: 0 2rem 2rem 0;
}
.pin_block{
.ant-checkbox-wrapper{

View File

@@ -569,7 +569,6 @@ export default defineComponent({
border-right: 1px solid #e5e5e5;
display: flex;
flex-direction: column;
flex-shrink: 0;
&.moodboard_body::-webkit-scrollbar {
display: none;
}
@@ -663,8 +662,8 @@ export default defineComponent({
}
.modal_img_max{
// flex: 1;
width: 49rem;
height: calc(49rem*0.614);
width: 57rem;
height: 35rem;
position: relative;
.mark_loading{
position: absolute;

View File

@@ -869,7 +869,7 @@ export default defineComponent({
.upload_file_item{
margin: 0 2rem 5rem 0;
// margin: 0 1rem 2rem 0;
// margin: 0 2rem 2rem 0;
display: inline-block;
width: 10rem;
height: 10rem;

View File

@@ -877,7 +877,7 @@ export default defineComponent({
.upload_file_item{
margin: 0 2rem 4rem 0;
// margin: 0 1rem 2rem 0;
// margin: 0 2rem 2rem 0;
display: inline-block;
width: 10rem;
height: 10rem;

View File

@@ -3,7 +3,7 @@
<a-modal class="modal_component collection_modal Guide_1_2"
v-model:visible="showCollectionModal"
:footer="null"
width="110rem"
width="65%"
:maskClosable="false"
:centered="true"
:closable="false"

View File

@@ -4,7 +4,7 @@
class="layout_modal"
v-model:visible="layout"
:footer="null"
width="110rem"
width="65%"
:maskClosable="false"
:centered="true"
:closable="false"
@@ -732,8 +732,8 @@ export default defineComponent({
.layout_centent{
display: flex;
// height: 55%;
width: 49rem;
height: calc(49rem*0.614);
height: 35rem;
width: 57rem;
// height: 60%;
flex-direction: column;
flex-wrap: wrap;

View File

@@ -4,7 +4,7 @@
class="layout_modal"
v-model:visible="layout"
:footer="null"
width="110rem"
width="65%"
:maskClosable="false"
:centered="true"
:closable="false"
@@ -28,7 +28,7 @@
</div>
<div class="layout_centent" :class="{active:flex_direction}" id="layoutCentent">
<div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="index" @touchstart="setpitch(item,index)" ref="content" >
<img crossOrigin="anonymous" :src="item.imgUrl" :style="{'transform':'translate(-50%, -50%) scale('+item.zoom+')'}" draggable="false" v-modelImg>
<img crossOrigin="anonymous" :src="item.imgUrl" :style="{'zoom':item.zoom}" draggable="false" v-modelImg>
<ul v-show="item.setPitch" class="layout_btn" >
<li class="layout_btn_top" v-compile.stop="'top'"></li>
<li class="layout_btn_bottom" v-compile.stop="'bottom'"></li>
@@ -502,7 +502,7 @@ export default defineComponent({
//移动图片
translate:{
mounted (el,layout:any,binding) {
el.ontouchstart = (e:any)=>{
el.addEventListener('touchstart',(e:any)=>{
e.stopPropagation()
let elParent = el.parentNode.parentNode
el.style.left = (el.offsetLeft+2)/(elParent.offsetWidth)*100+'%'
@@ -525,7 +525,6 @@ export default defineComponent({
el.previousSibling.style.left = left
elParent.firstChild.style.top = top
elParent.firstChild.style.left = left
if(el.offsetLeft <=0){
el.style.left = 0+'%'
el.previousSibling.style.left = 0+'%'
@@ -564,7 +563,7 @@ export default defineComponent({
})
});
}
})
},
},
modelImg:{
@@ -786,8 +785,8 @@ export default defineComponent({
.layout_centent{
display: flex;
// height: 55%;
width: 49rem;
height: calc(49rem*0.614);
height: 35rem;
width: 57rem;
// height: 60%;
flex-direction: column;
flex-wrap: wrap;

View File

@@ -3,7 +3,7 @@
class="scaleImage_modal"
v-model:visible="scaleImage"
:footer="null"
width="110rem"
width="65%"
:maskClosable="false"
:centered="true"
:closable="false"

View File

@@ -3,7 +3,7 @@
v-model:visible="setLabelShow"
:footer="null"
:title="$t('setLabel.EditTag')"
width="110rem"
width="65%"
:maskClosable="false"
:keyboard="false"
:centered="true"

View File

@@ -1,7 +1,6 @@
let flexible = (designWidth, maxWidth,minWidth) =>{
var doc = document, win = window, docEl = doc.documentElement, remStyle = document.createElement("style"), tid;
designWidth = designWidth || 1600;
designWidth = designWidth || 1920;
maxWidth = maxWidth || 2560;
minWidth = minWidth || 1024;
function refreshRem() {

View File

@@ -1220,8 +1220,7 @@ export default defineComponent({
.home_page_left {
// width: 44.4rem;
// width: 55rem;
width: 30%;
width: 55rem;
height: 100%;
padding: 2rem 0 0 0;
background: rgba(255, 255, 255, 0.2);

View File

@@ -73,7 +73,7 @@
<div class="right_content_body" v-show="uploadGenerate =='Upload'">
<div class="content_body_header">
<div class="content_body_header_left">
<div class="content_body_header_right content_body_header_right_updata">
<div class="content_body_header_right">
<div :class="['header_operate_item' , 'fontSize','active']">
<a-upload
v-show="uploadGenerate == 'Upload'"
@@ -118,7 +118,7 @@
:show-all-levels="false"
:clearable="true"
:placeholder="$t('LibraryPage.Select')"
:max-collapse-tags=1
:max-collapse-tags=3
:props="props"
:collapse-tags-tooltip="true"
ref="cascader"
@@ -263,7 +263,7 @@
<div
class="upload_component upload_file_item"
v-show="selectGenerateList.length < 1"
v-show="selectGenerateList.length <= 2"
>
<a-upload
:action="uploadUrl + '/api/element/upload'"
@@ -276,7 +276,7 @@
:headers="{Authorization:token}"
v-model:file-list="selectGenerateList"
multiple
:maxCount="1"
:maxCount="3"
accept=".jpg,.png,.jpeg,.bmp"
@change="generateFileUploadChange"
>
@@ -329,7 +329,7 @@
v-model:visible="renameVisivle"
:footer="null"
:title="$t('LibraryPage.Rename')"
width="110rem"
width="65%"
:keyboard="false"
:maskClosable="false"
:centered="true"
@@ -1454,10 +1454,10 @@ export default defineComponent({
display: flex;
padding-top: 2rem;
.library_body_left{
width: 22.5rem;
margin-right: auto;
width: 26.5rem;
height: 100%;
background: rgba(255,255,255,0.4);
margin-right: 5rem;
>div{
background: #f7f8fa;
border-radius: 2rem;
@@ -1517,7 +1517,7 @@ export default defineComponent({
}
}
.library_body_right{
width: calc(100% - 27.5rem);
width: calc(100% - 23.5rem);
height: 100%;
.header_operate_item{
@@ -1555,8 +1555,7 @@ export default defineComponent({
.content_search_block{
display: flex;
align-items: center;
width: 58rem;
// width: 75rem;
width: 75rem;
.search_input{
// width: 20.8rem;
// padding-left: 1.5rem;
@@ -1580,8 +1579,8 @@ export default defineComponent({
}
}
.search_cascader{
// width: 38rem;
width: 25rem;
// width: 53%;
width: 38rem;
display: flex;
position: relative;
@@ -1672,7 +1671,7 @@ export default defineComponent({
justify-content: flex-end;
align-items: center;
// padding: 2rem 0 2rem 3rem;
padding-left: 1rem;
padding-left: 3rem;
box-sizing: content-box;
justify-content: space-between;
.content_body_header_left{
@@ -1681,11 +1680,7 @@ export default defineComponent({
}
.content_body_header_right{
display: flex;
// width: 43rem;
width: 32rem;
&.content_body_header_right_updata{
width: 27rem;
}
width: 43rem;
}
.check_all_block{
display: flex;
@@ -1716,7 +1711,7 @@ export default defineComponent({
&.content_body_header_generate{
justify-content: flex-start;
.checkboxItem {
margin-right: 2rem;
margin-right: 4rem;
label {
display: flex;
cursor: pointer;
@@ -1725,7 +1720,7 @@ export default defineComponent({
padding-left: 1.5rem;
}
span {
font-size: 1.2rem;
font-size: 1.4rem;
font-weight: 500;
}
}
@@ -1734,7 +1729,7 @@ export default defineComponent({
background:initial;
padding: 1.5rem 0;
input{
width: 20rem;
width: 30rem;
height: 3rem;
&.active{
cursor: no-drop;
@@ -1742,14 +1737,14 @@ export default defineComponent({
}
.generage_btn{
margin: 0 2rem;
margin: 0 3rem;
}
}
.printModel{
font-size: 1.2rem;
font-size: 1.4rem;
font-weight: 500;
>div{
width: 12rem;
width: 13rem;
// display: flex;
display: block;
border-radius: 1rem;
@@ -1785,12 +1780,12 @@ export default defineComponent({
}
}
.upload_item{
margin-left: 2rem;
margin-left: 4rem;
.upload_file_item{
width: 8rem;
height: 8rem;
margin: 0;
// margin-right: 2rem;
margin-right: 2rem;
}
.upload_component{
margin: 0;
@@ -1827,8 +1822,8 @@ export default defineComponent({
border: 0.1rem solid transparent;
// width: 16.5rem;
// height: 16.5rem;
width: 15rem;
height: 15rem;
width: 17rem;
height: 17rem;
display: flex;
align-items: center;
justify-content: center;

View File

@@ -561,7 +561,7 @@ export default defineComponent({
left: 50%;
transform: translate(-50%,-50%);
// width: 60rem;
width: 127rem;
width: 150rem;
background: #FFFFFF;
// box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200,200,200,0.3);
border-radius: 1rem;
@@ -873,10 +873,10 @@ export default defineComponent({
}
.marign_top30 {
margin-top: 2rem;
margin-top: 3rem;
}
.marign_top40 {
margin-top: 3rem;
margin-top: 4rem;
}
.tip_content {