合并分支 'zz-dev' 到 'pre'

src/utils/setChart.js

@@ -6,6 +6,10 @@ import 'echarts-wordcloud';
 import router from '@/router/index'
 // import { goToDataCountryBill, goToDataDecree, goToDataThinkTank } from './goToPage';
 import goToPage from './goToPage/index';
+
+/** 与 multiLineChart 等 option.graphic 约定一致：自定义图例翻页箭头 */
+const LEGEND_ARROW_NAMES = new Set(['__legend_prev__', '__legend_next__']);
+
 const setChart = (option, chartId, allowClick, selectParam, otherAreaList) => {
   let chartDom = document.getElementById(chartId);
   if (!chartDom) {

src/views/thinkTank/MultiThinkTankViewAnalysis/index.vue

@@ -1449,6 +1449,7 @@ onMounted(async () => {
             border-bottom: 1px solid rgb(234, 236, 238);
             flex-shrink: 0;
             display: flex;
+            cursor: pointer;
 
             /* 防止item被挤压变形 */
             .left {
@@ -1559,7 +1560,7 @@ onMounted(async () => {
 
         .page-box {
           margin-top: 21px;
-        align-items: center;
+          align-items: center;
           justify-content: center;
           display: flex;
         }
@@ -2218,6 +2219,7 @@ onMounted(async () => {
             line-height: 30px;
             letter-spacing: 0;
             text-align: justify;
+            cursor: pointer;
           }
 
           .source-view-detail-org {
@@ -2541,6 +2543,7 @@ onMounted(async () => {
               line-height: 30px;
               letter-spacing: 0;
               text-align: justify;
+              cursor: pointer;
             }
 
             .source-view-detail-org {

src/views/thinkTank/allThinkTank/index.vue

@@ -205,7 +205,14 @@ const handleClick = tank => {
     ElMessage.warning("当前智库id为空,无法进入详情页");
     return;
   }
-  const curRoute = router.resolve({ name: "ThinkTankDetail", params: { id: tank.id, name: tank.name } });
+  let encoded;
+  try {
+    encoded = btoa(encodeURIComponent(String(tank.id)));
+  } catch (e) {
+    ElMessage.warning("当前智库id编码失败,无法进入详情页");
+    return;
+  }
+  const curRoute = router.resolve({ name: "ThinkTankDetail", params: { id: encoded } });
   window.open(curRoute.href, "_blank");
 };
 onMounted(async () => {
@@ -253,6 +260,7 @@ onMounted(async () => {
       min-height: 80px;
       position: relative;
 
+
       .to-back-btn {
         position: absolute;
         left: calc(50% - 76px - 1600px/2 - 20px - 33px);
@@ -266,6 +274,7 @@ onMounted(async () => {
         padding-left: 20px;
         margin-top: 24px;
         box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
+        cursor: pointer;
 
 
         .back-text {
@@ -468,6 +477,7 @@ onMounted(async () => {
           padding-top: 17px;
           padding-bottom: 21px;
           position: relative;
+          cursor: pointer;
 
           .red-info {
             color: rgb(255, 255, 255);

src/views/thinkTank/index.vue

@@ -1808,7 +1808,7 @@ const handleBox8ToDataLibrary = (item) => {
 }
 
 // 资源库
-const categoryList = ref(["智库报告", "调查项目", "国会听证会", "政策建议"]);
+const categoryList = ref(["智库报告", "调查项目", "国会听证会"]);
 const activeCate = ref("智库报告");
 const resourceTabResetKey = ref(0)