Merge branch 'ch/bug6852' of eta_front/eta_mobile_front into debug

src/views/report/PreviewDetail.vue

@@ -159,7 +159,7 @@ const getSystemInfoFun=()=>{
         <div class="html-head-img-box" v-if="reportInfo && reportInfo.HeadImg">
             <img :src="reportInfo.HeadImg" alt="" style="display:block;width:100%">
             <div class="head-layout-item" v-for="item in headImgStyle" :key="item.value"
-            :style="{fontFamily:item.family,fontSize:(item.size*2)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
+            :style="{fontFamily:item.family,fontSize:(item.sizeMobile || item.size)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
                 width:item.width,height:item.height,left:item.left,top:item.top
             }">
                 {{ layoutBaseInfo[item.value] }}
@@ -201,7 +201,7 @@ const getSystemInfoFun=()=>{
         <div class="html-end-img-box" v-if="reportInfo && reportInfo.EndImg">
             <img :src="reportInfo.EndImg" alt="" style="display:block;width:100%">
             <div class="head-layout-item" v-for="item in endImgStyle" :key="item.value"
-            :style="{fontFamily:item.family,fontSize:(item.size*2)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
+            :style="{fontFamily:item.family,fontSize:(item.sizeMobile || item.size)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
                 width:item.width,height:item.height,left:item.left,top:item.top
             }">
                 {{ layoutBaseInfo[item.value] }}

src/views/report/smartReport/EditReport.vue

@@ -846,12 +846,12 @@ const {
 
           <!-- 版头 -->
           <div class="html-head-img-box">
-              <div class="opt-btn-box"  style="display: none;">
+              <div class="opt-btn-box btn-top"  style="display: none;">
 									<van-icon name="delete-o" @click.stop="deleteLayoutPic(1)" color="#f00" size="22"/>
               </div>
               <img :src="headImg" alt="" style="display:block;width:100%">
               <div class="head-layout-item" v-for="item in headImgStyle" :key="item.value"
-              :style="{fontFamily:item.family,fontSize:(item.size*2)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
+              :style="{fontFamily:item.family,fontSize:(item.sizeMobile || item.size)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
                   width:item.width,height:item.height,left:item.left,top:item.top
               }">
                   {{ layoutBaseInfo[item.value] }}
@@ -985,7 +985,7 @@ const {
               </div>
               <img :src="endImg" alt="" style="display:block;width:100%">
               <div class="head-layout-item" v-for="item in endImgStyle" :key="item.value"
-              :style="{fontFamily:item.family,fontSize:(item.size*2)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
+              :style="{fontFamily:item.family,fontSize:(item.sizeMobile || item.size)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
                   width:item.width,height:item.height,left:item.left,top:item.top
               }">
                   {{ layoutBaseInfo[item.value] }}
@@ -1290,6 +1290,9 @@ const {
 		padding: 20px;
 		.html-head-img-box,.html-end-img-box{
 				position: relative;
+				.btn-top {
+					margin-top: 60px;
+				}
 				&:hover{
 						.opt-btn-box{
 								display: block !important;
@@ -1406,10 +1409,13 @@ const {
     }
 		.report-content-box{
 			.html-head-img-box,.html-end-img-box{
-					.opt-btn-box{
-						top:-32px;
-						padding: 6px 10px 0;
-					}
+				.btn-top {
+					margin-top: 30px;
+				} 
+				.opt-btn-box{
+					top:-32px;
+					padding: 6px 10px 0;
+				}
 			}
 		}