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

src/components/base/moduleHeader/index.vue

@@ -84,6 +84,7 @@ let isShowSearchBar = computed(() => {
 	return store.isShowSearchBar;
 });
 const router = useRouter();
+const route = useRoute()
 
 const personTypeList = ref([]);
 
@@ -231,14 +232,18 @@ const toolList = ref([
 ])
 
 const handleToModule = (item, index) => {
-	homeActiveTitleIndex.value = index
+
 	if (index === 1) {
+		homeActiveTitleIndex.value = index
 		router.push({
 			path: item.path
 		})
 	} else {
 		const curRoute = router.resolve({
-			path: item.path
+			path: item.path,
+			query: {
+				titleIndex: 2
+			}
 		});
 		window.open(curRoute.href, "_blank");
 	}
@@ -269,7 +274,12 @@ const handleClickToolBox = () => {
 
 onMounted(() => {
 	handleGetPersonType();
+	if (route.query.titleIndex) {
+		homeActiveTitleIndex.value = Number(route.query.titleIndex)
+	} else {
 		homeActiveTitleIndex.value = Number(window.localStorage.getItem('homeActiveTitleIndex'))
+
+	}
 });
 
 onUnmounted(() => {
@@ -457,26 +467,31 @@ onUnmounted(() => {
 				margin-left: 72px;
 				display: flex;
 				flex-wrap: wrap;
+
 				.menu-item {
 					margin-top: 36px;
 					width: 280px;
 					height: 24px;
 					display: flex;
 					cursor: pointer;
+
 					&:hover {
 						.title {
 							color: var(--color-main-active);
 							font-size: 20px;
 						}
 					}
+
 					.icon {
 						width: 24px;
 						height: 24px;
+
 						img {
 							width: 100%;
 							height: 100%;
 						}
 					}
+
 					.title {
 						margin-left: 16px;
 						height: 24px;
@@ -506,17 +521,20 @@ onUnmounted(() => {
 			backdrop-filter: blur(30px);
 			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 			background: rgba(255, 255, 255, 0.8);
+
 			.menu-content {
 				width: 562px;
 				height: 348px;
 				margin-top: 8px;
 				margin-left: 72px;
+
 				.menu-item {
 					margin-top: 36px;
 					width: 280px;
 					height: 24px;
 					display: flex;
 					cursor: pointer;
+
 					&:hover {
 						.title {
 							color: var(--color-main-active);
@@ -533,6 +551,7 @@ onUnmounted(() => {
 							height: 100%;
 						}
 					}
+
 					.title {
 						margin-left: 16px;
 						height: 24px;

src/views/bill/background/index.vue

@@ -148,19 +148,13 @@ const handleClickEvent = item => {
 // 跳转人员详情
 const handleClickUser = item => {
 	window.sessionStorage.setItem('curTabName', item.name)
-	// const routeData = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(routeData.href, "_blank");
-	router.push({
+	const routeData = router.resolve({
 		path: "/characterPage",
 		query: {
 			personId: item.id
 		}
-	})
+	});
+	window.open(routeData.href, "_blank");
 };
 
 const box1BtnActive = ref(1);

src/views/bill/billHome/ResourceLibrarySection.vue

@@ -433,21 +433,21 @@ const handleClickAvatar = async member => {
 					return;
 				}
 				window.sessionStorage.setItem("curTabName", member.name || "");
-				// const routeData = router.resolve({
-				// 	path: "/characterPage",
-				// 	query: {
-				// 		type,
-				// 		personId: member.id
-				// 	}
-				// });
-				// window.open(routeData.href, "_blank");
-				router.push({
+				const routeData = router.resolve({
 					path: "/characterPage",
 					query: {
 						type,
 						personId: member.id
 					}
-				})
+				});
+				window.open(routeData.href, "_blank");
+				// router.push({
+				// 	path: "/characterPage",
+				// 	query: {
+				// 		type,
+				// 		personId: member.id
+				// 	}
+				// })
 			} else {
 				personTypeName = "";
 				ElMessage.warning("找不到当前人员的类型值！");

src/views/bill/billHome/index.vue

@@ -331,23 +331,23 @@ const handleClickToCharacter = async (id, name) => {
 					return;
 				}
 				window.sessionStorage.setItem("curTabName", name);
-				// const route = router.resolve({
-				// 	path: "/characterPage",
-				// 	query: {
-				// 		type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
-				// 		personId: id
-				// 	}
-				// });
-				// window.open(route.href, "_blank");
-				router.push(
-					{
+				const route = router.resolve({
 					path: "/characterPage",
 					query: {
 						type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
 						personId: id
 					}
-					}
-				)
+				});
+				window.open(route.href, "_blank");
+				// router.push(
+				// 	{
+				// 		path: "/characterPage",
+				// 		query: {
+				// 			type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
+				// 			personId: id
+				// 		}
+				// 	}
+				// )
 			} else {
 				personTypeName = "";
 				ElMessage.warning("找不到当前人员的类型值！");
@@ -433,34 +433,29 @@ const curBill = ref({
 const handleClickToDetail = () => {
 	window.sessionStorage.setItem("billId", curBill.value.billId);
 	window.sessionStorage.setItem("curTabName", curBill.value.billName);
-	// const route = router.resolve({
-	// 	path: "/billLayout",
-	// 	query: {
-	// 		billId: curBill.value.billId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/billLayout",
 		query: {
 			billId: curBill.value.billId
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+
 };
 // 查看详情 传递参数
 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");
-	router.push("/billLayout?billId=" + item.billId)
+	const route = router.resolve("/billLayout?billId=" + item.billId);
+	window.open(route.href, "_blank");
+	// router.push("/billLayout?billId=" + item.billId)
 };
 
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	// const route = router.resolve("/viewRiskSignal");
-	// window.open(route.href, "_blank");
-	router.push("/viewRiskSignal")
+	const route = router.resolve("/viewRiskSignal");
+	window.open(route.href, "_blank");
+	// router.push("/viewRiskSignal")
 };
 // 风险信号
 const warningList = ref([]);
@@ -959,19 +954,19 @@ watch(box7selectetedTime, () => {
 });
 // 查看社交媒体详情
 const handleToSocialDetail = item => {
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			personId: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	// router.push({
+	// 	path: "/characterPage",
+	// 	query: {
+	// 		personId: item.id
+	// 	}
+	// })
 };
 // 关键条款
 const wordCloudData = ref([]);

src/views/bill/introdoction/index.vue

@@ -194,21 +194,21 @@ const handleClickAvatar = async item => {
 					return;
 				}
 				window.sessionStorage.setItem("curTabName", item.name || "");
-				// const routeData = router.resolve({
-				// 	path: "/characterPage",
-				// 	query: {
-				// 		type,
-				// 		personId: item.id
-				// 	}
-				// });
-				// window.open(routeData.href, "_blank");
-				router.push({
+				const routeData = router.resolve({
 					path: "/characterPage",
 					query: {
 						type,
 						personId: item.id
 					}
-				})
+				});
+				window.open(routeData.href, "_blank");
+				// router.push({
+				// 	path: "/characterPage",
+				// 	query: {
+				// 		type,
+				// 		personId: item.id
+				// 	}
+				// })
 			} else {
 				personTypeName = "";
 				ElMessage.warning("找不到当前人员的类型值！");

src/views/decree/allOrganization/index.vue

@@ -110,19 +110,19 @@ const handleDateChange = (event) => {
 // 跳转行政机构主页
 const handleToInstitution = item => {
   window.sessionStorage.setItem("curTabName", item.orgName);
-  // const curRoute = router.resolve({
-  // 	path: "/institution",
-  // 	query: {
-  // 		id: item.orgId
-  // 	}
-  // });
-  // window.open(curRoute.href, "_blank");
-  router.push({
+  const curRoute = router.resolve({
   	path: "/institution",
   	query: {
   		id: item.orgId
   	}
-  })
+  });
+  window.open(curRoute.href, "_blank");
+  // router.push({
+  //   path: "/institution",
+  //   query: {
+  //     id: item.orgId
+  //   }
+  // })
 };
 
 const refOrganization = ref()

src/views/decree/decreeHome/index.vue

@@ -514,19 +514,19 @@ const handleGetDepartmentList = async () => {
 // 跳转行政机构主页
 const handleToInstitution = item => {
 	window.sessionStorage.setItem("curTabName", item.orgName);
-	// const curRoute = router.resolve({
-	// 	path: "/institution",
-	// 	query: {
-	// 		id: item.orgId
-	// 	}
-	// });
-	// window.open(curRoute.href, "_blank");
-	router.push({
+	const curRoute = router.resolve({
 		path: "/institution",
 		query: {
 			id: item.orgId
 		}
-	})
+	});
+	window.open(curRoute.href, "_blank");
+	// router.push({
+	// 	path: "/institution",
+	// 	query: {
+	// 		id: item.orgId
+	// 	}
+	// })
 };
 // 跳转全部机构页面
 const onNavigateTo = () => {
@@ -535,16 +535,16 @@ const onNavigateTo = () => {
 
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	// const route = router.resolve("/viewRiskSignal");
-	// window.open(route.href, "_blank");
-	router.push("/viewRiskSignal")
+	const route = router.resolve("/viewRiskSignal");
+	window.open(route.href, "_blank");
+	// router.push("/viewRiskSignal")
 };
 
 // 查看更多新闻资讯
 const handleToMoreNews = () => {
-	// const route = router.resolve("/newsBrief");
-	// window.open(route.href, "_blank");
-router.push("/newsBrief")
+	const route = router.resolve("/newsBrief");
+	window.open(route.href, "_blank");
+// router.push("/newsBrief")
 };
 
 // 最新科技政令
@@ -588,55 +588,55 @@ const handleClickToDetail = () => {
 	const id = box1DataList.value[activeIndex].id;
 
 	window.sessionStorage.setItem("curTabName", box1DataList.value[activeIndex].name);
-	// const route = router.resolve({
-	// 	path: "/decreeLayout",
-	// 	query: {
-	// 		id: id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	
-router.push({
+	const route = router.resolve({
 		path: "/decreeLayout",
 		query: {
 			id: id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	
+// router.push({
+// 		path: "/decreeLayout",
+// 		query: {
+// 			id: id
+// 		}
+// 	})
 };
 
 // 点击政令库政令
 const handleClickDecree = decree => {
 	window.sessionStorage.setItem("curTabName", decree.title);
-	// const route = router.resolve({
-	// 	path: "/decreeLayout",
-	// 	query: {
-	// 		id: decree.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/decreeLayout",
 		query: {
 			id: decree.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	// router.push({
+	// 	path: "/decreeLayout",
+	// 	query: {
+	// 		id: decree.id
+	// 	}
+	// })
 };
 
 const handleKeyDecree = item => {
 	window.sessionStorage.setItem("curTabName", item.title);
-	// const route = router.resolve({
-	// 	path: "/decreeLayout",
-	// 	query: {
-	// 		id: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/decreeLayout",
 		query: {
 			id: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	// router.push({
+	// 	path: "/decreeLayout",
+	// 	query: {
+	// 		id: item.id
+	// 	}
+	// })
 };
 
 // 风险信号
@@ -779,23 +779,23 @@ const handleClickPerson = async item => {
 					return;
 				}
 				window.sessionStorage.setItem("curTabName", item.name);
-				// const route = router.resolve({
-				// 	path: "/characterPage",
-				// 	query: {
-				// 		type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
-				// 		personId: item.personId
-				// 	}
-				// });
-				// window.open(route.href, "_blank");
-				router.push(
-					{
+				const route = router.resolve({
 					path: "/characterPage",
 					query: {
 						type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
 						personId: item.personId
 					}
-				}
-				)
+				});
+				window.open(route.href, "_blank");
+				// router.push(
+				// 	{
+				// 	path: "/characterPage",
+				// 	query: {
+				// 		type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
+				// 		personId: item.personId
+				// 	}
+				// }
+				// )
 			} else {
 				personTypeName = "";
 				ElMessage.warning("找不到当前人员的类型值！");
@@ -1059,21 +1059,13 @@ const handleGetDecreeTypeList = async () => {
 };
 // 查看社交媒体详情
 const handleToSocialDetail = item => {
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push(
-		{
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			personId: item.id
 		}
-	}
-	)
+	});
+	window.open(route.href, "_blank");
 };
 const handleChangeCheckedDecreeType = () => {
 	handleGetDecreeOrderList();
@@ -1235,21 +1227,15 @@ const handleSwithCurDecree = name => {
 const searchDecreeText = ref("");
 const handleSearch = () => {
 	window.sessionStorage.setItem("curTabName", `搜索-${searchDecreeText.value}`);
-	// const curRoute = router.resolve({
-	// 	path: "/searchResults",
-	// 	query: {
-	// 		searchText: searchDecreeText.value,
-	// 		areaName: "政令"
-	// 	}
-	// });
-	// window.open(curRoute.href, "_blank");
-	router.push({
+	const curRoute = router.resolve({
 		path: "/searchResults",
 		query: {
 			searchText: searchDecreeText.value,
 			areaName: "政令"
 		}
-	})
+	});
+	window.open(curRoute.href, "_blank");
+	
 };
 
 // 关键机构

src/views/decree/decreeLayout/deepdig/index.vue

@@ -170,19 +170,19 @@ const onWordWrap = (word, num) => {
 }
 
 const handleClickDecree = decree => {
-	// const route = router.resolve({
-	// 	path: "/decreeLayout",
-	// 	query: {
-	// 		id: decree.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/decreeLayout",
 		query: {
 			id: decree.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	// router.push({
+	// 	path: "/decreeLayout",
+	// 	query: {
+	// 		id: decree.id
+	// 	}
+	// })
 };
 
 // 冲突关系

src/views/decree/decreeLayout/index.vue

@@ -243,19 +243,19 @@ const handleGetSummary = async () => {
 // };
 
 const handleShowReport = () => {
-	// const curRoute = router.resolve({
-	// 	path: "/decree/decreeOriginal",
-	// 	query: {
-	// 		id: route.query.id
-	// 	}
-	// });
-	// window.open(curRoute.href, "_blank");
-	router.push({
+	const curRoute = router.resolve({
 		path: "/decree/decreeOriginal",
 		query: {
 			id: route.query.id
 		}
-	})
+	});
+	window.open(curRoute.href, "_blank");
+	// router.push({
+	// 	path: "/decree/decreeOriginal",
+	// 	query: {
+	// 		id: route.query.id
+	// 	}
+	// })
 };
 
 const handleToInstitution = () => {

src/views/decree/decreeLayout/overview/background/index.vue

@@ -174,35 +174,35 @@ const handleGetPrev = async () => {
 };
 // 跳转行政机构主页
 const handleToInstitution = item => {
-	// const curRoute = router.resolve({
-	// 	path: "/institution",
-	// 	query: {
-	// 		id: item.orgId
-	// 	}
-	// });
-	// window.open(curRoute.href, "_blank");
-	router.push({
+	const curRoute = router.resolve({
 		path: "/institution",
 		query: {
 			id: item.orgId
 		}
-	})
+	});
+	window.open(curRoute.href, "_blank");
+	// router.push({
+	// 	path: "/institution",
+	// 	query: {
+	// 		id: item.orgId
+	// 	}
+	// })
 };
 // 跳转科技政令详情页
 const handleClickDecree = item => {
-	// const route = router.resolve({
-	// 	path: "/decreeLayout",
-	// 	query: {
-	// 		id: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/decreeLayout",
 		query: {
 			id: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	// router.push({
+	// 	path: "/decreeLayout",
+	// 	query: {
+	// 		id: item.id
+	// 	}
+	// })
 };
 
 // 法律依据
@@ -227,21 +227,15 @@ const handleGetLaws = async () => {
 const handleClickBull = decree => {
 	window.sessionStorage.setItem("billId", decree.billId);
 	window.sessionStorage.setItem("curTabName", decree.title);
-	// const route = router.resolve({
-	// 	path: "/billLayout",
-	// 	query: {
-	// 		billId: decree.billId
-	// 	}
-	// });
-	// console.log(route);
-
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/billLayout",
 		query: {
 			billId: decree.billId
 		}
-	})
+	});
+	console.log(route);
+
+	window.open(route.href, "_blank");
 };
 
 onMounted(() => {

src/views/decree/decreeLayout/overview/introduction/index.vue

@@ -318,32 +318,28 @@ const handleGetOrgnization = async () => {
 };
 // 跳转行政机构主页
 const handleToInstitution = item => {
-	// const curRoute = router.resolve({
-	// 	path: "/institution",
-	// 	query: { id: item.id }
-	// });
-	// window.open(curRoute.href, "_blank");
-	router.push({
+	const curRoute = router.resolve({
 		path: "/institution",
 		query: { id: item.id }
-	})
+	});
+	window.open(curRoute.href, "_blank");
 };
 // 跳转人员详情
 const handleClickUser = item => {
 	window.sessionStorage.setItem('curTabName', item.name)
-	// const routeData = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(routeData.href, "_blank");
-	router.push({
+	const routeData = router.resolve({
 		path: "/characterPage",
 		query: {
 			personId: item.id
 		}
-	})
+	});
+	window.open(routeData.href, "_blank");
+	// router.push({
+	// 	path: "/characterPage",
+	// 	query: {
+	// 		personId: item.id
+	// 	}
+	// })
 };
 
 onMounted(() => {

src/views/decree/decreeLayout/overview/measures/index.vue

@@ -403,36 +403,25 @@ const handleOrganization = (node) => {
 };
 // 跳转机构主页
 const handleToInstitution = () => {
-	// const curRoute = router.resolve({
-	// 	path: "/institution",
-	// 	query: {
-	// 		id: organizationInfo.node.id
-	// 	}
-	// });
-	// window.open(curRoute.href, "_blank");
-	router.push({
+	const curRoute = router.resolve({
 		path: "/institution",
 		query: {
 			id: organizationInfo.node.id
 		}
-	})
+	});
+	window.open(curRoute.href, "_blank");
 };
 // 跳转人员详情
 const handleClickUser = item => {
 	window.sessionStorage.setItem('curTabName', item.name)
-	// const routeData = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(routeData.href, "_blank");
-	router.push({
+	const routeData = router.resolve({
 		path: "/characterPage",
 		query: {
 			personId: item.id
 		}
-	})
+	});
+	window.open(routeData.href, "_blank");
+	
 };
 
 onMounted(() => {

src/views/exportControl/index.vue

@@ -822,20 +822,15 @@ const handleToPosi = id => {
 // 跳转到单项制裁页面
 const handleToRiskSignalDetail = item => {
 	window.sessionStorage.setItem("curTabName", item.title);
-	// const routeData = router.resolve({
-	// 	path: "/exportControl/singleSanction",
-	// 	query: {
-	// 		id: item.sanId
-	// 	}
-	// });
-	// // 打开新页面
-	// window.open(routeData.href, "_blank");
-	router.push({
+	const routeData = router.resolve({
 		path: "/exportControl/singleSanction",
 		query: {
 			id: item.sanId
 		}
-	})
+	});
+	// 打开新页面
+	window.open(routeData.href, "_blank");
+	
 };
 
 const sanctionList = ref([]);
@@ -891,21 +886,14 @@ const checkedTime = ref(["全部时间"]);
 // 跳转到单条制裁页面，单独打开一个新页面
 const handleTitleClick = item => {
 	window.sessionStorage.setItem("curTabName", `${item.year}-${item.dateStr}《${item.title}》`);
-	// const route = router.resolve({
-	// 	path: "/exportControl/singleSanction",
-	// 	query: {
-	// 		id: item.id,
-	// 		sanTypeId: item.sanTypeId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/exportControl/singleSanction",
 		query: {
 			id: item.id,
 			sanTypeId: item.sanTypeId
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 const handleCompClick = item => {
@@ -1047,19 +1035,14 @@ onMounted(async () => {
 });
 // 查看社交媒体详情
 const handleToSocialDetail = item => {
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			personId: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+
 };
 // 获取趋势图数据
 const fetchTrendData = async () => {
@@ -1175,55 +1158,38 @@ const handleToEntityList = item => {
 		"curTabName",
 		entitiesDataInfoList.value[currentCarouselIndex.value].postDate + " 《实体清单新增条目》"
 	);
-	// const routeData = router.resolve({
-	// 	path: "/exportControl/singleSanction",
-	// 	query: {
-	// 		id: id
-	// 	}
-	// });
-	// // 打开一个新页面
-	// window.open(routeData.href, "_blank");
-	router.push({
+	const routeData = router.resolve({
 		path: "/exportControl/singleSanction",
 		query: {
 			id: id
 		}
-	})
+	});
+	// 打开一个新页面
+	window.open(routeData.href, "_blank");
 };
 
 // 跳转到V2.0实体清单无ID
 const handleToEntityListNoId = item => {
 	console.log("这是什么数据 =>", item);
 	if (item.nameZh == "实体清单") {
-		// const routeData = router.resolve({
-		// 	path: "/exportControl/entityList",
-		// 	query: {
-		// 		sanTypeId: item.id
-		// 	}
-		// });
-		// // 打开一个新页面
-		// window.open(routeData.href, "_blank");
-		router.push({
+		const routeData = router.resolve({
 			path: "/exportControl/entityList",
 			query: {
 				sanTypeId: item.id
 			}
-		})
+		});
+		// 打开一个新页面
+		window.open(routeData.href, "_blank");
+
 	} else if (item.nameZh == "商业管制清单") {
-		// const routeData = router.resolve({
-		// 	path: "/exportControl/commercialControlList",
-		// 	query: {
-		// 		sanTypeId: item.id
-		// 	}
-		// });
-		// // 打开一个新页面
-		// window.open(routeData.href, "_blank");
-		router.push({
+		const routeData = router.resolve({
 			path: "/exportControl/commercialControlList",
 			query: {
 				sanTypeId: item.id
 			}
-		})
+		});
+		// 打开一个新页面
+		window.open(routeData.href, "_blank");
 	} else {
 		return;
 	}
@@ -1697,21 +1663,15 @@ const fetchNewsInfo = async () => {
 const handlePerClick = item => {
 	// console.log("点击了社交媒体消息:", item);
 	window.sessionStorage.setItem("curTabName", item.name);
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		type: item.type || [1, 2, 3][Math.floor(Math.random() * 3)],
-	// 		personId: item.personId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			type: item.type || [1, 2, 3][Math.floor(Math.random() * 3)],
 			personId: item.personId
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	
 };
 // 处理点击社交媒体消息的方法
 // const handleInfoClick = item => {
@@ -1793,35 +1753,29 @@ const chart1Data = ref({
 const handleSanc = item => {
 	console.log(item);
 	window.sessionStorage.setItem("curTabName", `${item.postDate}《${item.title}》`);
-	// const route = router.resolve({
-	// 	path: "/exportControl/singleSanction",
-	// 	query: {
-	// 		id: item.id,
-	// 		sanTypeId: activeResourceTabItem.value.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/exportControl/singleSanction",
 		query: {
 			id: item.id,
 			sanTypeId: activeResourceTabItem.value.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	
 };
 
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	// const route = router.resolve("/viewRiskSignal");
-	// window.open(route.href, "_blank");
-	router.push("/viewRiskSignal")
+	const route = router.resolve("/viewRiskSignal");
+	window.open(route.href, "_blank");
+	// router.push("/viewRiskSignal")
 };
 
 // 查看更多新闻资讯
 const handleToMoreNews = () => {
-	// const route = router.resolve("/newsBrief");
-	// window.open(route.href, "_blank");
-	router.push("/newsBrief")
+	const route = router.resolve("/newsBrief");
+	window.open(route.href, "_blank");
+	// router.push("/newsBrief")
 };
 
 const handleNewsInfoClick = item => {
@@ -1848,21 +1802,14 @@ const handleSwithCurPolicy = name => {
 
 const handleSearch = () => {
 	window.sessionStorage.setItem("curTabName", `搜索-${searchExportControlText.value}`);
-	// const curRoute = router.resolve({
-	// 	path: "/searchResults",
-	// 	query: {
-	// 		searchText: searchExportControlText.value,
-	// 		areaName: "实体清单"
-	// 	}
-	// });
-	// window.open(curRoute.href, "_blank");
-	router.push({
+	const curRoute = router.resolve({
 		path: "/searchResults",
 		query: {
 			searchText: searchExportControlText.value,
 			areaName: "实体清单"
 		}
-	})
+	});
+	window.open(curRoute.href, "_blank");
 };
 
 onMounted(async () => {

src/views/exportControl/v2.0CommercialControlList/components/sanctionsOverview/components/introductionPage/index.vue

@@ -181,58 +181,40 @@ import { useRoute } from "vue-router";
 const route = useRoute();
 // 处理点击发布机构的方法
 const handleClickOrg = item => {
-	// console.log("点击了发布机构:", item);
-	// const route = router.resolve({
-	// 	path: "/institution",
-	// 	query: {
-	// 		id: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	console.log("点击了发布机构:", item);
+	const route = router.resolve({
 		path: "/institution",
 		query: {
 			id: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	
 };
 
 // 处理点击关键人物的方法
 const handlePerClick = item => {
 	console.log("点击了关键人物:", item);
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		type: item.type,
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			type: item.type,
 			personId: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 // 处理点击实体名称的方法
 const handleClick = item => {
-	// console.log("点击了实体名称:", item);
-	// const route = router.resolve({
-	// 	path: "/exportControl/singleSanction",
-	// 	query: {
-	// 		id: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	console.log("点击了实体名称:", item);
+	const route = router.resolve({
 		path: "/exportControl/singleSanction",
 		query: {
 			id: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 
 };
 

src/views/exportControl/v2.0EntityList/components/sanctionsOverview/components/introductionPage/index.vue

@@ -211,59 +211,41 @@ import { useRoute } from "vue-router";
 const route = useRoute();
 // 处理点击发布机构的方法
 const handleClickOrg = item => {
-	// console.log("点击了发布机构:", item);
-	// const route = router.resolve({
-	// 	path: "/institution",
-	// 	query: {
-	// 		id: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	console.log("点击了发布机构:", item);
+	const route = router.resolve({
 		path: "/institution",
 		query: {
 			id: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 // 处理点击关键人物的方法
 const handlePerClick = item => {
 	console.log("点击了关键人物:", item);
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		type: item.type,
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			type: item.type,
 			personId: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 // 处理点击实体名称的方法
 const handleClick = item => {
 	// console.log("点击了实体名称:", item);
 	window.sessionStorage.setItem("curTabName", `${item.year}-${item.date}《${item.name}》`);
-	// const route = router.resolve({
-	// 	path: "/exportControl/singleSanction",
-	// 	query: {
-	// 		id: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/exportControl/singleSanction",
 		query: {
 			id: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+	
 };
 
 const selectedDomain = ref(0);

src/views/exportControl/v2.0SingleSanction/components/sanctionsOverview/index.vue

@@ -216,19 +216,13 @@ const handleCompClick = item => {
 const handleClickDp = () => {
 	// console.log("点击了发布机构:", props.data);
 	window.sessionStorage.setItem("curTabName", props.data.postOrgName);
-	// const route = router.resolve({
-	// 	path: "/institution",
-	// 	query: {
-	// 		id: props.data.postOrgId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/institution",
 		query: {
 			id: props.data.postOrgId
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 // 50%规则子企业弹框逻辑
@@ -390,22 +384,14 @@ const props = defineProps({
 // 跳转到人物页
 const handleClick = () => {
 	window.sessionStorage.setItem("curTabName", props.data.postPersonName);
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		// type: props.data.type,
-	// 		personId: props.data.postPersonId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			// type: props.data.type,
 			personId: props.data.postPersonId
 		}
-	})
-
+	});
+	window.open(route.href, "_blank");
 };
 
 // 计算属性处理数据

src/views/thinkTank/MultiThinkTankViewAnalysis/index.vue

@@ -916,19 +916,13 @@ const handleCurrentChange = page => {
 const handleToReportDetail = (item) => {
   if (!item?.id) return;
   window.sessionStorage.setItem("curTabName", item.name);
-  // const route = router.resolve({
-  //   name: "ReportDetail",
-  //   params: {
-  //     id: item.id
-  //   }
-  // });
-  // window.open(route.href, "_blank");
-  router.push({
+  const route = router.resolve({
     name: "ReportDetail",
     params: {
       id: item.id
     }
-  })
+  });
+  window.open(route.href, "_blank");
 };
 //获取行业领域字典
 // getHylyList

src/views/thinkTank/ReportDetail/index.vue

@@ -125,20 +125,14 @@ const handleGetThinkTankReport = async () => {
 };
 const toReport = () => {
 	console.log(reportUrl.value, "reportUrl.valuereportUrl.value");
-	// const route = router.resolve({
-	// 	name: "ReportOriginal",
-	// 	params: {
-	// 		id: router.currentRoute._value.params.id
-	// 	}
-	// });
-	// console.log("route.href", route.href);
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		name: "ReportOriginal",
 		params: {
 			id: router.currentRoute._value.params.id
 		}
-	})
+	});
+	console.log("route.href", route.href);
+	window.open(route.href, "_blank");
 };
 const tabActiveName = ref("报告分析");
 

src/views/thinkTank/ReportDetail/policyTracking/index.vue

@@ -201,19 +201,13 @@ const scrollToWrapTop = () => {
 
 const toReport = () => {
 
-	// const route = router.resolve({
-	// 	name: "ReportOriginal",
-	// 	params: {
-	// 		id: router.currentRoute._value.params.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		name: "ReportOriginal",
 		params: {
 			id: router.currentRoute._value.params.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 // 当前页展示的数据
 const filteredOpinions = computed(() => box1Data.value);
@@ -230,15 +224,11 @@ const handleBillMoreClick = (bill) => {
 	if (!billId) {
 		return;
 	}
-	// const route = router.resolve({
-	// 	path: "/billLayout/bill/introduction",
-	// 	query: { billId: String(billId) }
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/billLayout/bill/introduction",
 		query: { billId: String(billId) }
-	})
+	});
+	window.open(route.href, "_blank");
 };
 /** 政策建议关联法案：新标签页打开政令介绍页*/
 const handleAdministrativeMoreClick = (ad) => {
@@ -246,15 +236,11 @@ const handleAdministrativeMoreClick = (ad) => {
 	if (!id) {
 		return;
 	}
-	// const route = router.resolve({
-	// 	path: "/decreeLayout/overview/introduction",
-	// 	query: { id: String(id) }
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/decreeLayout/overview/introduction",
 		query: { id: String(id) }
-	})
+	});
+	window.open(route.href, "_blank");
 };
 const handleSearchOpinions = () => {
 	// 搜索时默认切回“全部”标签

src/views/thinkTank/ReportDetail/reportAnalysis/index.vue

@@ -239,15 +239,11 @@ import TipTab from "@/views/thinkTank/TipTab/index.vue";
 const router = useRouter();
 const goToAllThinkTank = () => {
 	const thinkTankId = props?.thinkInfo?.thinkTankId || props?.thinkInfo?.id;
-	// const route = router.resolve({
-	// 	name: "MultiThinkTankViewAnalysis",
-	// 	params: { id: thinkTankId }
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		name: "MultiThinkTankViewAnalysis",
 		params: { id: thinkTankId }
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 
@@ -367,19 +363,13 @@ const handleClickReportAuthor = async (author) => {
 	const res = await getPersonSummaryInfo(params);
 	if (res.code !== 200 || !res.data) return;
 	window.sessionStorage.setItem("curTabName", author?.name || "");
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		personId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			personId
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 const riskSignal = computed(() => {
 	const info = props.thinkInfo || {};
@@ -527,20 +517,7 @@ const majorOpinions = ref([
 ]);
 //处理点击详情页事件
 const handleOpenReportOriginal = item => {
-	// const route = router.resolve({
-	// 	name: "ReportOriginal",
-	// 	params: {
-	// 		id: router.currentRoute._value.params.id
-	// 	},
-	// 	query: {
-	// 		currentPage: currentPage.value,
-	// 		pageSize: pageSize.value,
-	// 		opinionId: item?.id ?? "",
-	// 		opinionContent: item?.content ?? ""
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		name: "ReportOriginal",
 		params: {
 			id: router.currentRoute._value.params.id
@@ -551,7 +528,8 @@ const handleOpenReportOriginal = item => {
 			opinionId: item?.id ?? "",
 			opinionContent: item?.content ?? ""
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 const tabActiveName = ref("报告分析");
 

src/views/thinkTank/ThinkTankDetail/PolicyTracking/index.vue

@@ -504,15 +504,11 @@ const handleBillMoreClick = (bill) => {
 	if (!billId) {
 		return;
 	}
-	// const route = router.resolve({
-	// 	path: "/billLayout/bill/introduction",
-	// 	query: { billId: String(billId) }
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/billLayout/bill/introduction",
 		query: { billId: String(billId) }
-	})
+	});
+	window.open(route.href, "_blank");
 };
 /** 政策建议关联法案：新标签页打开政令介绍页*/
 const handleAdministrativeMoreClick = (ad) => {
@@ -520,15 +516,11 @@ const handleAdministrativeMoreClick = (ad) => {
 	if (!id) {
 		return;
 	}
-	// const route = router.resolve({
-	// 	path: "/decreeLayout/overview/introduction",
-	// 	query: { id: String(id) }
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/decreeLayout/overview/introduction",
 		query: { id: String(id) }
-	})
+	});
+	window.open(route.href, "_blank");
 };
 // 政策建议涉及部门分布（饼图）
 const box2Data = ref([]);
@@ -1228,19 +1220,14 @@ function mapPolicyRowToView(row) {
 
 const toDetail = item => {
 	window.sessionStorage.setItem("curTabName", item.contentZh ?? item.content ?? "");
-	// const route = router.resolve({
-	// 	name: "ReportOriginal",
-	// 	params: {
-	// 		id: item.reportId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		name: "ReportOriginal",
 		params: {
 			id: item.reportId
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+
 };
 
 const total = ref(0);

src/views/thinkTank/ThinkTankDetail/thinkDynamics/index.vue

@@ -111,19 +111,14 @@ const searchReport = ref('')
 
 const handleToReportDetail = (item) => {
 	window.sessionStorage.setItem('curTabName', item.name)
-	// const route = router.resolve({
-	// 	name: 'ReportDetail',
-	// 	params: {
-	// 		id: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		name: 'ReportDetail',
 		params: {
 			id: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
+
 }
 const hearingData = ref([
 	// 军事类（10条）

src/views/thinkTank/ThinkTankDetail/thinkInfo/index.vue

@@ -726,20 +726,15 @@ const handleClickPerson = async item => {
 				return !Number.isNaN(typeIdNum) && !Number.isNaN(personTypeNum) && typeIdNum === personTypeNum;
 			});
 			console.log("arr", arr);
-			// const route = router.resolve({
-			// 	path: "/characterPage",
-			// 	query: {
-
-			// 		personId: item.personId
-			// 	}
-			// });
-			// window.open(route.href, "_blank");
-			router.push({
+			const route = router.resolve({
 				path: "/characterPage",
 				query: {
+
 					personId: item.personId
 				}
-			})
+			});
+			window.open(route.href, "_blank");
+			
 
 		} else {
 			ElMessage.warning("找不到当前人员的类型值！");

src/views/thinkTank/allThinkTank/index.vue

@@ -205,9 +205,8 @@ const handleClick = tank => {
     ElMessage.warning("当前智库id为空,无法进入详情页");
     return;
   }
-  // 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 } })
+  const curRoute = router.resolve({ name: "ThinkTankDetail", params: { id: tank.id, name: tank.name } });
+  window.open(curRoute.href, "_blank");
 };
 onMounted(async () => {
   handleGetThinkTankList();

src/views/thinkTank/index.vue

@@ -695,19 +695,13 @@ const handleClickToDetail = () => {
 
 const toDetaile = () => {
 	window.sessionStorage.setItem("curTabName", box1Data.value[box1DataIndex.value].reportName);
-	// const route = router.resolve({
-	// 	name: "ReportDetail",
-	// 	params: {
-	// 		id: box1Data.value[box1DataIndex.value].reportId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		name: "ReportDetail",
 		params: {
 			id: box1Data.value[box1DataIndex.value].reportId
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 // 切换当前智库
@@ -1670,19 +1664,13 @@ const handleGetHylyList = async () => {
 };
 // 查看社交媒体详情
 const handleToSocialDetail = item => {
-	// const route = router.resolve({
-	// 	path: "/characterPage",
-	// 	query: {
-	// 		personId: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/characterPage",
 		query: {
 			personId: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 const selectedAreaList = ref([RESOURCE_FILTER_ALL_AREA]);
 
@@ -1986,23 +1974,23 @@ const handleClick = tank => {
 		ElMessage.warning("当前智库id为空,无法进入详情页");
 		return;
 	}
-	// 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 } })
+	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 } })
 };
 
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	// const route = router.resolve("/viewRiskSignal");
-	// window.open(route.href, "_blank");
-	router.push("/viewRiskSignal")
+	const route = router.resolve("/viewRiskSignal");
+	window.open(route.href, "_blank");
+	// router.push("/viewRiskSignal")
 };
 
 // 查看更多新闻资讯
 const handleToMoreNews = () => {
-	// const route = router.resolve("/newsBrief");
-	// window.open(route.href, "_blank");
-	router.push("/newsBrief")
+	const route = router.resolve("/newsBrief");
+	window.open(route.href, "_blank");
+	// router.push("/newsBrief")
 };
 
 // 点击人物头像，跳转到人物主页
@@ -2042,21 +2030,14 @@ const handleClickPerson = async item => {
 					return;
 				}
 				window.sessionStorage.setItem("curTabName", item.personName);
-				// const route = router.resolve({
-				// 	path: "/characterPage",
-				// 	query: {
-				// 		type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
-				// 		personId: item.personId
-				// 	}
-				// });
-				// window.open(route.href, "_blank");
-				router.push({
+				const route = router.resolve({
 					path: "/characterPage",
 					query: {
 						type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
 						personId: item.personId
 					}
-				})
+				});
+				window.open(route.href, "_blank");
 			} else {
 				personTypeName = "";
 				ElMessage.warning("找不到当前人员的类型值！");
@@ -2071,55 +2052,36 @@ const handleClickPerson = async item => {
 
 // 点击新闻条目，跳转到新闻分析页
 const handleToNewsAnalysis = news => {
-	// const route = router.resolve({
-	// 	path: "/newsAnalysis",
-	// 	query: {
-	// 		newsId: news.newsId
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		path: "/newsAnalysis",
 		query: {
 			newsId: news.newsId
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 const handleToReportDetail = item => {
 	window.sessionStorage.setItem("curTabName", item.name);
-	// const route = router.resolve({
-	// 	name: "ReportDetail",
-	// 	params: {
-	// 		id: item.id
-	// 	}
-	// });
-	// window.open(route.href, "_blank");
-	router.push({
+	const route = router.resolve({
 		name: "ReportDetail",
 		params: {
 			id: item.id
 		}
-	})
+	});
+	window.open(route.href, "_blank");
 };
 
 const handleSearch = () => {
 	window.sessionStorage.setItem("curTabName", `搜索-${searchThinktankText.value}`);
-	// const curRoute = router.resolve({
-	// 	path: "/searchResults",
-	// 	query: {
-	// 		searchText: searchThinktankText.value,
-	// 		areaName: "智库"
-	// 	}
-	// });
-	// window.open(curRoute.href, "_blank");
-	router.push({
+	const curRoute = router.resolve({
 		path: "/searchResults",
 		query: {
 			searchText: searchThinktankText.value,
 			areaName: "智库"
 		}
-	})
+	});
+	window.open(curRoute.href, "_blank");
 };
 
 onMounted(async () => {