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

src/utils/setChart.js

@@ -37,6 +37,8 @@ const setChart = (option, chartId, allowClick, selectParam) => {
     });
   });
 
+
+
   if (allowClick) {
     chart.on('click', function (params) {
       // 图例分页箭头只负责翻页，不走任何跳转

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

@@ -293,8 +293,10 @@ import defaultNewsIcon from "@/assets/icons/default-icon-news.png";
 import AreaTag from "@/components/base/AreaTag/index.vue";
 
 import { useRouter } from "vue-router";
+import { getDecodedParams } from "@/utils/goToPage";
 
 const router = useRouter();
+const thinkTankId = computed(() => getDecodedParams());
 
 const loading = ref(false);
 const pageScrollRef = ref(null);
@@ -475,8 +477,10 @@ const selectableDepartment = ref([]);
 const handleGetThinkPolicyIndustry = async () => {
 	aiContentPolicyPt1.value = "";
 	try {
+		const id = thinkTankId.value;
+		if (!id) return;
 		const parmas = {
-			id: router.currentRoute._value.params.id,
+			id,
 			year: box1SelectYear.value
 		};
 		const res = await getThinkPolicyIndustry(parmas);
@@ -570,8 +574,10 @@ const box2TotalData = ref([]);
 const handleGetPolicyAdviceDeptDistribution = async () => {
 	aiContentPolicyPt2.value = "";
 	try {
+		const id = thinkTankId.value;
+		if (!id) return;
 		const parmas = {
-			id: router.currentRoute._value.params.id,
+			id,
 			year: box2SelectYear.value
 		};
 		const res = await getPolicyAdviceDeptDistribution(parmas);
@@ -631,8 +637,10 @@ const box2YearList = ref([
 
 const handleGetThinkPolicyIndustryTotal = async () => {
 	try {
+		const id = thinkTankId.value;
+		if (!id) return;
 		const parmas = {
-			id: router.currentRoute._value.params.id,
+			id,
 			year: box2SelectYear.value
 		};
 		const res = await getThinkPolicyIndustryTotal(parmas);
@@ -712,8 +720,10 @@ const box3MonthsList = ref([
 const handleGetThinkPolicyIndustryChange = async () => {
 	aiContentPolicyPt3.value = "";
 	try {
+		const id = thinkTankId.value;
+		if (!id) return;
 		const parmas = {
-			id: router.currentRoute._value.params.id,
+			id,
 			year: box3SelectMonths.value
 		};
 		const res = await getThinkPolicyIndustryChange(parmas);
@@ -1343,7 +1353,8 @@ const handleCurrentChange = page => {
 const handleGetThinkPolicy = async () => {
 	try {
 		loading.value = true;
-		const thinkTankId = router.currentRoute._value.params.id;
+		const curThinkTankId = thinkTankId.value;
+		if (!curThinkTankId) return;
 		const domainIds = selectedAreaList.value
 			.filter((id) => id != null && id !== "" && id !== POLICY_FILTER_ALL_AREA)
 			.map((id) => String(id))
@@ -1357,7 +1368,7 @@ const handleGetThinkPolicy = async () => {
 			selectedYear.value
 		);
 		const parmas = {
-			thinkTankId,
+			thinkTankId: curThinkTankId,
 			startDate,
 			endDate,
 			pageNum: currentPage.value,

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

@@ -78,9 +78,11 @@ import {
 	getResourceLibraryReportDateRangeFromTimeSelection
 } from "../../utils/resourceLibraryFilters";
 import { useRouter } from "vue-router";
+import { getDecodedParams } from "@/utils/goToPage";
 import ThinkTankReport from "./ThinkTankReport/index.vue";
 import CongressHearing from "./CongressHearing/index.vue";
 const router = useRouter();
+const thinkTankId = getDecodedParams();
 const isThinkTankReport = ref(true);
 const isSurveyForm = ref(false);
 const isCongressHearing = ref(false);
@@ -420,7 +422,6 @@ const handleGetThinkDynamicsReport = async (payload) => {
 			? ""
 			: arrayToString(areas);
 		const keyword = (searchReport.value || "").trim();
-		const thinkTankId = router.currentRoute._value.params?.id;
 		if (isCongressHearing.value) {
 			curFooterList.value = [];
 			curFooterProjectList.value = [];

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

@@ -259,6 +259,7 @@ import { ref, onMounted, nextTick, computed } from "vue";
 import setChart from "@/utils/setChart";
 import getPieChart from "./utils/piechart";
 import getTreeMapChart from "./utils/treeMapChart";
+import { getDecodedParams } from "@/utils/goToPage";
 import {
 	getThinkTankInfoBasic,
 	getThinkTankInfoBranch,
@@ -274,6 +275,7 @@ import DefaultIcon1 from '@/assets/icons/default-icon1.png'
 import { getPersonSummaryInfo } from "@/api/common/index";
 const totalPersonNumber = ref(0)
 const router = useRouter();
+const thinkTankId = getDecodedParams();
 import InfoImg from "./images/img.png";
 import Icon1 from "./images/icon1.png";
 import Icon2 from "./images/icon2.png";
@@ -297,7 +299,7 @@ const basicInfo = ref({
 const handleGetThinkTankInfoBasic = async () => {
 	try {
 
-		const res = await getThinkTankInfoBasic(router.currentRoute._value.params.id);
+		const res = await getThinkTankInfoBasic(thinkTankId);
 		console.log("基本信息", res);
 		if (res.code === 200 && res.data) {
 			basicInfo.value = res.data
@@ -319,7 +321,7 @@ const worldInfo = ref({
 const handleGetThinkTankInfoBranch = async () => {
 	try {
 
-		const res = await getThinkTankInfoBranch(router.currentRoute._value.params.id);
+		const res = await getThinkTankInfoBranch(thinkTankId);
 		console.log("全球分支机构", res);
 		if (res.code === 200 && res.data) {
 
@@ -397,7 +399,7 @@ const box1ChartData = ref([
 const handleGetThinkTankFundsTotal = async () => {
 	try {
 
-		const res = await getThinkTankFundsSource(router.currentRoute._value.params.id);
+		const res = await getThinkTankFundsSource(thinkTankId);
 		console.log("获取经费来源统计", res);
 		if (res.code === 200 && res.data) {
 			// 后端字段已更新：totalAmount/usGovernmentAmount/pentagonContractorAmount
@@ -419,7 +421,7 @@ const handleGetThinkTankFundsTotal = async () => {
 const handleGetThinkTankFundsSource = async () => {
 	try {
 
-		const res = await getThinkTankFundsSource(router.currentRoute._value.params.id);
+		const res = await getThinkTankFundsSource(thinkTankId);
 		console.log("获取经费来源", res);
 		if (res.code === 200 && res.data) {
 
@@ -561,7 +563,7 @@ const timeLineList = ref([
 const handleGetThinkTankResearchAreae = async () => {
 	try {
 
-		const res = await getThinkTankResearchAreae(router.currentRoute._value.params.id);
+		const res = await getThinkTankResearchAreae(thinkTankId);
 		console.log("研究领域演变", res);
 		if (res.code === 200 && res.data) {
 			timeLineList.value = res.data
@@ -675,7 +677,7 @@ const handleGetThinkPerson = async (page = personCurrentPage.value) => {
 		const params = {
 			currentPage: safePage,
 			pageSize: PERSON_PAGE_SIZE,
-			thinkTankId: router.currentRoute._value.params.id
+			thinkTankId
 		}
 		const res = await getThinkTankPerson(params);