Merge branch 'bug-fix' into custom

src/style/common.scss

@@ -24,6 +24,51 @@ li {
     list-style: none;
 }
 
+// 报告在编辑预览的时候和分享出来的页面样式不一样，下面是eta_front中的标签公共样式
+body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,button,input,textarea,th,td { margin:0; padding:0; }
+body{ font-size:12px; font-style:normal; font-family:"\5FAE\8F6F\96C5\9ED1", Helvetica, sans-serif,; }
+html{ overflow:auto; /* min-width:1000px; */ }
+small{ font-size:12px; }
+h1{ font-size:18px; }
+h2{ font-size:16px; }
+h3{ font-size:14px; }
+h4,h5,h6{ font-size:100%; }
+ul,ol{ list-style:none; }
+a{ text-decoration:none; background-color:transparent; }
+a:hover,a:active{ outline-width:0; text-decoration:none; }
+table{ border-collapse:collapse; border-spacing:0; }
+// hr{ border:0; height:1px; }
+img{ border-style:none; }
+img:not([src]){ display:none; }
+svg:not(:root){ overflow:hidden; }
+html{ -webkit-touch-callout:none; -webkit-text-size-adjust:100%; }
+input,textarea,button,a{ -webkit-tap-highlight-color:rgba(0,0,0,0); }
+article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{ display:block; }
+audio,canvas,progress,video{ display:inline-block; }
+audio:not([controls]),video:not([controls]){ display:none; height:0; }
+progress{ vertical-align:baseline; }
+mark{ background-color:#ff0; color:#000; }
+sub,sup{ position:relative; font-size:75%; line-height:0; vertical-align:baseline; }
+sub{ bottom:-0.25em; }
+sup{ top:-0.5em; }
+button,input,select,textarea{ font-size:100%; outline:0; }
+button,input{ overflow:visible; }
+button,select{ text-transform:none; }
+textarea{ overflow:auto; }
+button,html[type="button"],[type="reset"],[type="submit"]{ -webkit-appearance:button; }
+button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{ border-style:none; padding:0; }
+button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{ outline:1px dotted ButtonText; }
+[type="checkbox"],[type="radio"]{ box-sizing:border-box; padding:0; }
+[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{ height:auto; }
+[type="search"]{ -webkit-appearance:textfield; outline-offset:-2px; }
+[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{ -webkit-appearance:none; }
+::-webkit-input-placeholder{ color:inherit; opacity:.54; }
+::-webkit-file-upload-button{ -webkit-appearance:button; font:inherit; }
+.clear:after{ display:block; height:0; content:""; clear:both; }
+
+.highcharts-range-selector-group{ display:none; }
+.highcharts-legend-item tspan{ font-weight:400;  }
+
 // 禁止页面打印
 @media print{
     body{

src/views/report/reportDetail.vue

@@ -25,7 +25,7 @@
         "
       >
         <span>{{ reportInfo.Author }}</span>
-        <span style="float: right">{{ reportInfo.PublishTime }}</span>
+        <span style="float: right" v-if="[2,6].includes(reportInfo.State)">{{ reportInfo.PublishTime }}</span>
       </div>
 
       <div id="playcon" v-if="reportInfo.VideoUrl">

src/views/report/reportDetailPdf.vue

@@ -25,7 +25,7 @@
         "
       >
         <span>{{ reportInfo.Author }}</span>
-        <span style="float: right">{{ reportInfo.PublishTime }}</span>
+        <span style="float: right" v-if="[2,6].includes(reportInfo.State)">{{ reportInfo.PublishTime }}</span>
       </div>
 
       <div id="playcon" v-if="reportInfo.VideoUrl">

src/views/reportEn/detail.vue

@@ -25,7 +25,7 @@
         "
       >
         <span>{{ reportInfo.Author }}</span>
-        <span style="float: right">{{ reportInfo.PublishTime }}</span>
+        <span style="float: right" v-if="[2,6].includes(reportInfo.State)">{{ reportInfo.PublishTime }}</span>
       </div>
 
       <div id="abstract">

src/views/reportEn/detailPdf.vue

@@ -25,7 +25,7 @@
         "
       >
         <span>{{ reportInfo.Author }}</span>
-        <span style="float: right">{{ reportInfo.PublishTime }}</span>
+        <span style="float: right" v-if="[2,6].includes(reportInfo.State)">{{ reportInfo.PublishTime }}</span>
       </div>
 
       <div id="abstract">

src/views/smartReport/detail.vue

@@ -23,7 +23,7 @@
           <header>{{reportInfo.Title}}</header>
           <div style=" box-sizing:border-box; color:#666; font-size:24px; overflow:hidden;">
             <span>{{ reportInfo.Author}}</span>
-            <span style="float:right;">{{reportInfo.CreateTime}}</span>
+            <span style="float:right;" v-if="[2,6].includes(reportInfo.State)">{{reportInfo.PublishTime}}</span>
           </div>
         </div>
         <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice">
@@ -204,16 +204,12 @@ 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.map(st =>{
-        st.value=st.value || st.label
-      })
       this.endImgStyle=this.reportInfo.EndStyle?JSON.parse(this.reportInfo.EndStyle):[]
-      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
+      // 已发布已通过的报告才显示发布时间
+      this.layoutBaseInfo['创建时间']=[2,6].includes(this.reportInfo.State)?this.reportInfo.PublishTime:''
+      
       this.Disclaimer = Data.Disclaimer || "";
       this.isshow = true;
       this.$nextTick(()=>{

src/views/smartReport/detailPdf.vue

@@ -16,7 +16,7 @@
           <header>{{reportInfo.Title}}</header>
           <div style=" box-sizing:border-box; color:#666; font-size:24px; overflow:hidden;">
             <span>{{ reportInfo.Author}}</span>
-            <span style="float:right;">{{reportInfo.CreateTime}}</span>
+            <span style="float:right;" v-if="[2,6].includes(reportInfo.State)">{{reportInfo.PublishTime}}</span>
           </div>
         </div>
         <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice">
@@ -81,16 +81,11 @@ export default {
       
       this.reportInfo = Data.Report;
       this.headImgStyle=this.reportInfo.HeadStyle?JSON.parse(this.reportInfo.HeadStyle):[]
-      this.headImgStyle.map(st =>{
-        st.value=st.value || st.label
-      })
       this.endImgStyle=this.reportInfo.EndStyle?JSON.parse(this.reportInfo.EndStyle):[]
-      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
+      // 已发布已通过的报告才显示发布时间
+      this.layoutBaseInfo['创建时间']=[2,6].includes(this.reportInfo.State)?this.reportInfo.PublishTime:''
       this.reportInfo.Content=this.setReportContent(this.reportInfo.Content)
       this.isshow = true;
       this.$nextTick(()=>{