feat:新增goToPage.js文件

src/views/bill/billHome/index.vue

@@ -322,6 +322,7 @@ import iconILetter from "./assets/icons/icon-iLetter.png";
 
 import { ElMessage } from "element-plus";
 import { useGotoNewsDetail } from "@/router/modules/news";
+import { goToBill } from "@/utils/goToPage";
 
 // 跳转人物主页（MessageBubble 的 person-click 传入整条列表项，需取 personId）
 const handleClickToCharacter = async item => {
@@ -518,11 +519,12 @@ const handleClickToDetail = () => {
 };
 // 查看详情 传递参数
 const handleClickToDetailO = item => {
-	window.sessionStorage.setItem("billId", item.billId);
-	window.sessionStorage.setItem("curTabName", item.name || item.signalTitle);
-	const route = router.resolve("/billLayout?billId=" + item.billId);
-	window.open(route.href, "_blank");
+	// window.sessionStorage.setItem("billId", item.billId);
+	// window.sessionStorage.setItem("curTabName", item.name || item.signalTitle);
+	// const route = router.resolve("/billLayout?billId=" + item.billId);
+	// window.open(route.href, "_blank");
 	// router.push("/billLayout?billId=" + item.billId)
+	goToBill(item.billId, item.signalTitle)
 };
 
 const isRiskOverviewDetailOpen = ref(false);

src/views/thinkTank/ThinkTankDetail/index.vue

@@ -64,6 +64,7 @@ import PolicyTracking from "./PolicyTracking/index.vue";
 import ThinkInfo from "./thinkInfo/index.vue";
 import { getThinkTankSummary } from "@/api/thinkTank/overview";
 import { useRouter } from "vue-router";
+import { getDecodedParams } from "@/utils/goToPage";
 
 const router = useRouter();
 const tabActiveName = ref("智库动态");
@@ -74,9 +75,13 @@ const switchTab = name => {
 const thinkTank = ref({});
 // 获取智库基本信息
 const handleGetThinkTankSummary = async () => {
+
+	const id = getDecodedParams()
+
+	
 	try {
 		const parmas = {
-			id: router.currentRoute._value.params.id
+			id: id
 		};
 		const res = await getThinkTankSummary(parmas);
 		console.log("智库信息", res);

src/views/thinkTank/index.vue

@@ -515,6 +515,7 @@ import { setCanvasCreator } from "echarts/core";
 import { ElMessage } from "element-plus";
 import { useRouter } from 'vue-router';
 import { useGotoNewsDetail } from '@/router/modules/news';
+import { goToThinkTank } from "@/utils/goToPage";
 const gotoNewsDetail = useGotoNewsDetail()
 const containerRef = ref(null);
 const isRiskDetailVisible = ref(false);
@@ -2284,14 +2285,17 @@ const handleGetetThinkTankReport = async () => {
 
 const handleClick = tank => {
 	console.log(tank);
-	window.sessionStorage.setItem("curTabName", tank.name + "概览");
+
 	// router.push({ name: "ThinkTankDetail", params: { id: tank.id } });
 	if (!tank.id) {
 		ElMessage.warning("当前智库id为空,无法进入详情页");
 		return;
 	}
-	const curRoute = router.resolve({ name: "ThinkTankDetail", params: { id: tank.id, name: tank.name } });
-	window.open(curRoute.href, "_blank");
+	goToThinkTank(tank.id, tank.name + "概览")
+	// 	window.sessionStorage.setItem("curTabName", tank.name + "概览");
+	// const curRoute = router.resolve({ name: "ThinkTankDetail", params: { id: tank.id, name: tank.name } });
+	// window.open(curRoute.href, "_blank");
+
 	// router.push({ name: "ThinkTankDetail", params: { id: tank.id, name: tank.name } })
 };