Merge branch 'need_pool237' into debug

src/views/hzsl/report/newReport/ChapterDetail.vue

@@ -5,7 +5,7 @@
       <!-- <div class="title">【第{{info.report_chapter_item.stage}}期 | {{info.report_chapter_item.classify_name_first}}  | {{info.report_chapter_item.type_name}}】{{info.report_chapter_item.title}}</div> -->
       <div class="title">{{title}}</div>
       <div class="flex time">
-        <span>FICC团队</span>
+        <span>{{info.report_chapter_item.author}}</span>
         <span>{{formatTime(info.report_chapter_item.publish_time)}}</span>
       </div>
       <!-- 音频模块 -->

src/views/hzsl/report/newReport/Detail.vue

@@ -50,7 +50,7 @@
             <!-- <div class="title">【第{{info.report_info.stage}}期｜{{info.report_info.classify_name_second}}】{{info.report_info.title}}</div> -->
             <div class="title">{{title}}</div>
             <div class="flex time">
-                <span>FICC团队</span>
+                <span>{{info.report_info.author}}</span>
                 <span>{{formatTime(info.report_info.publish_time)}}</span>
             </div>
             <!-- 音频模块 -->

src/views/hzyb/chart/Detail.vue

@@ -601,6 +601,7 @@ function initSectionalCombinationChart(data){
         let obj={
           data:dataArr,
           type: item.ChartStyle||'',
+          dashStyle: (chartTheme&&chartTheme.lineOptionList[lineIndex].dashStyle)||'Solid',
           chartType:'linear',
           yAxis: serie_yIndex,
           name:item.SeriesName,
@@ -630,12 +631,41 @@ function initSectionalCombinationChart(data){
     })
     
     console.log(seriesData);
+
+    const tooltip={
+        formatter:function () { 
+          let str=`<b>${this.points[0].x}</b>`
+          this.points.forEach(item=>{
+            const sObj=seriesData.find(_=>_.name===item.series.name)
+            str=str+`<br><span style="color:${item.color}">\u25CF</span>${sObj.name}:${item.y} ${sObj.unitNameCh}`
+          })
+          return str
+        },
+        formatterCh:function () { 
+          let str=`<b>${this.points[0].x}</b>`
+          this.points.forEach(item=>{
+            const sObj=seriesData.find(_=>_.name===item.series.name)
+            str=str+`<br><span style="color:${item.color}">\u25CF</span>${sObj.nameCh}:${item.y} ${sObj.unitNameCh}`
+          })
+          return str
+        },
+        formatterEn:function () { 
+          let str=`<b>${this.points[0].x}</b>`
+          this.points.forEach(item=>{
+            const sObj=seriesData.find(_=>_.name===item.series.name)
+            str=str+`<br><span style="color:${item.color}">\u25CF</span>${sObj.nameEn}:${item.y} ${sObj.unitNameEn}`
+          })
+          return str
+        },
+        shared:true
+    }
     
 
     chartData.value = {
         title: {
             text:''
         },
+        tooltip,
         series: seriesData,
         yAxis: yAxis,
         xAxis,

src/views/hzyb/report/ChapterDetail.vue

@@ -15,7 +15,7 @@
         <template v-if="(!info.report_chapter_item.head_img) && (!info.report_chapter_item.end_img)">
           <div class="title">{{title}}</div>
           <div class="flex time">
-            <span>FICC团队</span>
+            <span>{{info.report_chapter_item.author}}</span>
             <span>{{formatTime(info.report_chapter_item.publish_time)}}</span>
           </div>
         </template>

src/views/hzyb/report/Detail.vue

@@ -9,7 +9,7 @@
     </div> -->
     <div class="report-detail-page" @click="closeAttention" v-if="info" :style="{paddingBottom:$store.state.hzyb.audioData.url&&'80px'}">
         <!-- 晨报、周报章节 -->
-        <div class="chapter-list-wrap" v-if="info.report_info.has_chapter&&report_detail_show_type===2">
+        <div class="chapter-list-wrap" v-if="info.report_info.has_chapter&&info.report_detail_show_type===2">
             <div class="top-box" :style="'background-image:url(' + info.report_info.banner_url + ')'">
                 <div class="title">{{info.report_info.classify_name_first}}</div>
                 <div class="sub-title">{{info.report_info.title}}</div>
@@ -72,7 +72,7 @@
                 <template v-if="(!info.report_info.head_img) && (!info.report_info.end_img)">
                     <div class="title">{{title}}</div>
                     <div class="flex time">
-                        <span>FICC团队</span>
+                        <span>{{info.report_info.author}}</span>
                         <span>{{formatTime(info.report_info.publish_time)}}</span>
                     </div>
                 </template>