hbchen 10 months ago
parent
commit
3baff8536b
2 changed files with 12 additions and 4 deletions
  1. 6 2
      src/views/smartReport/detail.vue
  2. 6 2
      src/views/smartReport/detailPdf.vue

+ 6 - 2
src/views/smartReport/detail.vue

@@ -201,9 +201,13 @@ 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.headImgStyle.map(st =>{
+        st.value=st.value || st.label
+      })
       this.endImgStyle=this.reportInfo.EndStyle?JSON.parse(this.reportInfo.EndStyle):[]
-      this.endImgStyle.value?this.endImgStyle.value:this.endImgStyle.label
+      this.endImgStyle.map(st =>{
+        st.value=st.value || st.label
+      })
       this.layoutBaseInfo['研报标题']=this.reportInfo.Title
       this.layoutBaseInfo['研报作者']=this.reportInfo.Author
       this.layoutBaseInfo['创建时间']=this.reportInfo.CreateTime

+ 6 - 2
src/views/smartReport/detailPdf.vue

@@ -81,9 +81,13 @@ 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.headImgStyle.map(st =>{
+        st.value=st.value || st.label
+      })
       this.endImgStyle=this.reportInfo.EndStyle?JSON.parse(this.reportInfo.EndStyle):[]
-      this.endImgStyle.value?this.endImgStyle.value:this.endImgStyle.label
+      this.endImgStyle.map(st =>{
+        st.value=st.value || st.label
+      })
       this.layoutBaseInfo['研报标题']=this.reportInfo.Title
       this.layoutBaseInfo['研报作者']=this.reportInfo.Author
       this.layoutBaseInfo['创建时间']=this.reportInfo.CreateTime