版头版尾样式

src/views/smartReport/detail.vue

@@ -12,11 +12,11 @@
       <div>
         <div class="html-head-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.HeadImg">
           <img :src="reportInfo.HeadImg" alt="" style="display:block;width:100%">
-          <div class="head-layout-item" v-for="item in headImgStyle" :key="item.label"
+          <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,
               width:item.width,height:item.height,left:item.left,top:item.top
           }">
-              {{ layoutBaseInfo[item.label] }}
+              {{ layoutBaseInfo[item.value] }}
           </div>
         </div>
         <div class="no-layout-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && (!reportInfo.HeadImg) && (!reportInfo.EndImg)">
@@ -32,11 +32,11 @@
         <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content"></div>
         <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg">
           <img :src="reportInfo.EndImg" alt="" style="display:block;width:100%">
-          <div class="head-layout-item" v-for="item in endImgStyle" :key="item.label"
+          <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,
               width:item.width,height:item.height,left:item.left,top:item.top
           }">
-              {{ layoutBaseInfo[item.label] }}
+              {{ layoutBaseInfo[item.value] }}
           </div>
         </div> 
         <!-- <div id="resetcss">
@@ -201,7 +201,9 @@ export default {
         : Data.Report.Title + "(" + Data.Report.CreateTime.substring(5, 7) + Data.Report.CreateTime.substring(8, 10) + ")";
       this.reportInfo = Data.Report || {};
       this.headImgStyle=this.reportInfo.HeadStyle?JSON.parse(this.reportInfo.HeadStyle):[]
+      this.headImgStyle.value?this.headImgStyle.value:this.headImgStyle.label
       this.endImgStyle=this.reportInfo.EndStyle?JSON.parse(this.reportInfo.EndStyle):[]
+      this.endImgStyle.value?this.endImgStyle.value:this.endImgStyle.label
       this.layoutBaseInfo['研报标题']=this.reportInfo.Title
       this.layoutBaseInfo['研报作者']=this.reportInfo.Author
       this.layoutBaseInfo['创建时间']=this.reportInfo.CreateTime

src/views/smartReport/detailPdf.vue

@@ -5,11 +5,11 @@
       <div>
         <div class="html-head-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.HeadImg">
           <img :src="reportInfo.HeadImg" alt="" style="display:block;width:100%">
-          <div class="head-layout-item" v-for="item in headImgStyle" :key="item.label"
+          <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,
               width:item.width,height:item.height,left:item.left,top:item.top
           }">
-              {{ layoutBaseInfo[item.label] }}
+              {{ layoutBaseInfo[item.value] }}
           </div>
         </div>
         <div class="no-layout-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && (!reportInfo.HeadImg) && (!reportInfo.EndImg)">
@@ -25,11 +25,11 @@
         <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content"></div>
         <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg">
           <img :src="reportInfo.EndImg" alt="" style="display:block;width:100%">
-          <div class="head-layout-item" v-for="item in endImgStyle" :key="item.label"
+          <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,
               width:item.width,height:item.height,left:item.left,top:item.top
           }">
-              {{ layoutBaseInfo[item.label] }}
+              {{ layoutBaseInfo[item.value] }}
           </div>
         </div> 
       </div>
@@ -81,7 +81,9 @@ export default {
       
       this.reportInfo = Data.Report;
       this.headImgStyle=this.reportInfo.HeadStyle?JSON.parse(this.reportInfo.HeadStyle):[]
+      this.headImgStyle.value?this.headImgStyle.value:this.headImgStyle.label
       this.endImgStyle=this.reportInfo.EndStyle?JSON.parse(this.reportInfo.EndStyle):[]
+      this.endImgStyle.value?this.endImgStyle.value:this.endImgStyle.label
       this.layoutBaseInfo['研报标题']=this.reportInfo.Title
       this.layoutBaseInfo['研报作者']=this.reportInfo.Author
       this.layoutBaseInfo['创建时间']=this.reportInfo.CreateTime