Merge branch 'need-pool-12.5'

src/views/report/Detail.vue

@@ -201,7 +201,7 @@ const getAsideBanner=async (data)=>{
 
 //点击侧边栏报告合集
 const handleAsideBanner=(data)=>{
-    if(data.Type=='报告合集'){
+    if(data.Type=='报告合集'&&data.ShowType===1){
         router.push({
             path:'/report/list',
             query:{
@@ -209,7 +209,15 @@ const handleAsideBanner=(data)=>{
                 classifyName:data.ClassifyNameFirst
             }
         })
-    }else{
+    }else if(data.Type=='报告合集'&&data.ShowType===3){
+      router.push({
+        path:'/report/varietyreportlist',
+        query:{
+          classifyId:data.ClassifyIdFirst,
+        }
+      })
+    }
+    else{
         router.push({
             path:'/report/specialcolumndetail',
             query:{
@@ -528,8 +536,9 @@ const formatTitle=(e)=>{
                             <div class="stage">更新至{{banner.Stage}}期</div>
                         </div>
                         <!-- 报告列表 -->
-                        <div v-else class="rep-box">
-                            <span class="stage">第{{banner.Stage}}期</span>
+                        <div v-else class="rep-box cloumn-box">
+                          <div class="title">{{banner.ClassifyNameFirst.substring(0, 12)}}</div>
+                            <!-- <span class="stage">第{{banner.Stage}}期</span> -->
                         </div>
                     </div>
                 </div>