feat:update

src/components/base/moduleHeader/index.vue

@@ -102,6 +102,7 @@ import Tool1 from './tool1.svg'
 import Tool2 from './tool2.svg'
 import { ElMessage } from "element-plus";
 import { useWrittingAsstaintStore } from "@/stores/writtingAsstaintStore";
+import goToPage from "@/utils/goToPage";
 const store = useWrittingAsstaintStore();
 let isShowSearchBar = computed(() => {
 	return store.isShowSearchBar;
@@ -151,8 +152,8 @@ const handleGetSsoUserInfo = async () => {
 };
 
 // 概览页标题列表
-const homeTitleList = computed(() => {
-	const mainTitleList = [
+const homeTitleList = ref(
+	[
 		{
 			name: "首页",
 			path: "/ZMOverView",
@@ -174,20 +175,7 @@ const homeTitleList = computed(() => {
 			path: "/dataLibrary",
 			disabled: false
 		}]
-	const dataLibraryTitleList = [{
-		name: "数据资源库",
-		path: "/dataLibrary",
-		disabled: false
-	}]
-
-	// if (route.path.includes('/dataLibrary')) {
-	// 	return dataLibraryTitleList
-	// } else {
-	// 	return mainTitleList
-	// }
-
-	return mainTitleList
-});
+)
 
 const homeActiveTitleIndex = computed(() => {
 	let activeIndex = 1
@@ -406,8 +394,10 @@ const handleToModule = (item, index) => {
 };
 
 const handleClickTitle = (item, index) => {
-	if (index === 0 || index === 3) {
+	if (index === 0) {
 		router.push(item.path)
+	} else if(index === 3) {
+		goToPage.goToDataLibrary()
 	}
 };
 

src/utils/goToPage/methods/company.js

@@ -11,7 +11,9 @@ export const goToCompanyPage = (id, tabName) => {
   const base64 = btoa(encodeURIComponent(jsonStr));
   const route = router.resolve({
     name: "companyPages",
-    params: base64
+    params: {
+      id: base64
+    }
   });
   window.open(route.href, "_blank");
 }
\ No newline at end of file

src/utils/goToPage/methods/dataLibrary.js

 // 数据资源库
 import router from "@/router/index";
 
+export const goToDataLibrary = () => {
+    const route = router.resolve({
+    path: "/dataLibrary",
+  });
+  window.open(route.href, "_blank");
+}
+
 // 跳转数据资源库-国家法案
 export const goToDataCountryBill = (selectParam) => {
   // const codeParam = new URLSearchParams(selectParam)

src/utils/goToPage/methods/news.js

@@ -3,15 +3,15 @@ import router from "@/router/index";
 // 跳转新闻详情
 export const goToNewsPage = (id, tabName) => {
   window.sessionStorage.setItem("curTabName", tabName);
-  const param = {
-    newsId: id
-  }
-  const jsonStr = JSON.stringify(param);
-  const base64 = btoa(encodeURIComponent(jsonStr));
+  // const param = {
+  //   newsId: id
+  // }
+  // const jsonStr = JSON.stringify(param);
+  const base64 = btoa(encodeURIComponent(id));
   const route = router.resolve({
-    path: "/newsAnalysis",
-    query: {
-      data: base64
+    name: "newsDetail",
+    params: {
+      id: base64
     }
   });
   window.open(route.href, "_blank");

src/utils/goToPage/methods/technologyFigure.js

@@ -11,17 +11,11 @@ export const goToCharacterPage = async (id, tabName) => {
     personId: id
   }
   const param1 = {
-    personId: item.id
+    personId: id
   }
   const jsonStr1 = JSON.stringify(param1);
   const base64_1 = btoa(encodeURIComponent(jsonStr1));
 
-  const param2 = {
-    personId: item.id
-  }
-  const jsonStr2 = JSON.stringify(param2);
-  const base64_2 = btoa(encodeURIComponent(jsonStr2));
-
   // 先获取人物全局信息
   try {
     const res = await getPersonSummaryInfo(params)
@@ -48,6 +42,12 @@ export const goToCharacterPage = async (id, tabName) => {
           window.open(route.href, "_blank");
           return;
         }
+        const param2 = {
+          personId: id,
+          type: type
+        }
+        const jsonStr2 = JSON.stringify(param2);
+        const base64_2 = btoa(encodeURIComponent(jsonStr2));
         const route = router.resolve({
           path: "/characterPage",
           query: {

src/utils/goToPage/methods/thinkTank.js

@@ -16,10 +16,11 @@ export const goToThinkTank = (id, tabName) => {
 // 跳转智库报告详情
 export const goToThinkTankReport = (id, tabName) => {
   window.sessionStorage.setItem("curTabName", tabName);
+   const base64 = btoa(encodeURIComponent(id));
   const route = router.resolve({
     name: "ReportDetail",
     params: {
-      id: id
+      id: base64
     }
   });
   window.open(route.href, "_blank");

src/views/dataLibrary/bill/countryBill/index.vue

@@ -1155,7 +1155,7 @@ const initParam = () => {
   const routeQuery = goToPage.getDecodedParams()
   console.log('routeQuery',routeQuery);
   
-  const hasQuery = Object.keys(routeQuery).length > 0;
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
     if (routeQuery.selectedAreaList) {
       selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
@@ -1213,30 +1213,11 @@ const initParam = () => {
 
 // 跳转法案详情
 const handleClickToDetail = (curBill) => {
-  // console.log('curBill', curBill);
-  // window.sessionStorage.setItem("billId", curBill.id);
-  // window.sessionStorage.setItem("curTabName", curBill.title);
-  // const route = router.resolve({
-  //   path: "/billLayout",
-  //   query: {
-  //     billId: curBill.id
-  //   }
-  // });
-  // window.open(route.href, "_blank");
   goToPage.goToBill(curBill.id, curBill.title)
 };
 
 // 跳转人物详情
 const handlePerClick = item => {
-  // window.sessionStorage.setItem("curTabName", item.sponsorPersonName);
-  // const route = router.resolve({
-  //   path: "/characterPage",
-  //   query: {
-  //     type: 2,
-  //     personId: item.personId
-  //   }
-  // });
-  // window.open(route.href, "_blank");
   goToPage.goToCharacterPage(item.personId, item.sponsorPersonName)
 };
 

src/views/dataLibrary/company/index.vue

@@ -127,7 +127,7 @@
             </el-table-column>
             <el-table-column label="所属国家地区">
               <template #default="scope">
-                <span class="person-item text-compact" @click="handleOrgClick(scope.row)">{{ scope.row.organizationName
+                <span class="person-item text-compact">{{ scope.row.organizationName
                 }}</span>
               </template>
             </el-table-column>
@@ -172,6 +172,7 @@ import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
 
 import { getCountryList, getBusinessType } from '@/api/comprehensiveSearch/index'
+import goToPage from '@/utils/goToPage'
 
 const route = useRoute();
 
@@ -1055,29 +1056,17 @@ const initParam = () => {
 const handleClickToDetail = (item) => {
   console.log('item', item);
 
-  window.sessionStorage.setItem('curTabName', item.originalTitle)
-  const route = router.resolve({
-    name: "companyPages",
-    params: {
-      id: item.id
-    }
-  });
-  window.open(route.href, "_blank");
+  // window.sessionStorage.setItem('curTabName', item.originalTitle)
+  // const route = router.resolve({
+  //   name: "companyPages",
+  //   params: {
+  //     id: item.id
+  //   }
+  // });
+  // window.open(route.href, "_blank");
+  goToPage.goToCompanyPage(item.id, item.originalTitle)
 };
 
-// 跳转机构详情
-const handleOrgClick = item => {
-  console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
-};
 
 // 导出
 const handleExport = () => {

src/views/dataLibrary/decree/index.vue

@@ -977,7 +977,7 @@ const handleDownloadCurChartData = () => {
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
   const routeQuery = goToPage.getDecodedParams()
-  const hasQuery = Object.keys(routeQuery).length > 0;
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
     if (routeQuery.selectedAreaList) {
       selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
@@ -1025,30 +1025,13 @@ const initParam = () => {
 // 跳转政令详情
 const handleClickToDetail = (curDecree) => {
   console.log('curDecree', curDecree);
-
-  window.sessionStorage.setItem("decreeId", curDecree.id);
-  window.sessionStorage.setItem("curTabName", curDecree.title);
-  const route = router.resolve({
-    path: "/decreeLayout",
-    query: {
-      id: curDecree.id
-    }
-  });
-  window.open(route.href, "_blank");
+  goToPage.goToDecree(curDecree.id, curDecree.title)
 };
 
 // 跳转机构详情
 const handleOrgClick = item => {
   console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
+  goToPage.goToInstitution(item.id, item.title)
 };
 
 // 导出

src/views/dataLibrary/exportControl/commerceControlList/index.vue

@@ -115,7 +115,7 @@
             <el-table-column type="selection" width="40" />
             <el-table-column label="物项名称">
               <template #default="scope">
-                <span class="title-item text-compact-bold" @click="handleClickToDetail(scope.row)">{{
+                <span class="title-item text-compact-bold">{{
                   scope.row.originalTitle
                 }}</span>
               </template>
@@ -922,7 +922,7 @@ const handleDownloadCurChartData = () => {
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
   const routeQuery = goToPage.getDecodedParams()
-  const hasQuery = Object.keys(routeQuery).length > 0;
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
     if (routeQuery.selectedAreaList) {
       selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
@@ -960,25 +960,6 @@ const initParam = () => {
 
 }
 
-// 跳转政令详情
-const handleClickToDetail = (curDecree) => {
-
-};
-
-// 跳转机构详情
-const handleOrgClick = item => {
-  console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
-};
-
 // 导出
 const handleExport = () => {
   if (!selectedCount.value) {
@@ -1278,12 +1259,12 @@ onMounted(async () => {
 
 .title-item {
   color: var(--text-primary-80-color);
-  cursor: pointer;
+  // cursor: pointer;
 
-  &:hover {
-    color: var(--color-primary-100);
-    text-decoration: underline;
-  }
+  // &:hover {
+  //   color: var(--color-primary-100);
+  //   text-decoration: underline;
+  // }
 }
 
 .person-item {

src/views/dataLibrary/exportControl/commerceControlListEvent/index.vue

@@ -114,7 +114,7 @@
             <el-table-column type="selection" width="40" />
             <el-table-column label="事件名称">
               <template #default="scope">
-                <span class="title-item text-compact-bold" @click="handleClickToDetail(scope.row)">{{
+                <span class="title-item text-compact-bold">{{
                   scope.row.originalTitle
                 }}</span>
               </template>
@@ -805,7 +805,7 @@ const handleDownloadCurChartData = () => {
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
   const routeQuery = goToPage.getDecodedParams()
-  const hasQuery = Object.keys(routeQuery).length > 0;
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
     if (routeQuery.selectedAreaList) {
       selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
@@ -843,25 +843,6 @@ const initParam = () => {
 
 }
 
-// 跳转政令详情
-const handleClickToDetail = (curDecree) => {
-
-};
-
-// 跳转机构详情
-const handleOrgClick = item => {
-  console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
-};
-
 // 导出
 const handleExport = () => {
   if (!selectedCount.value) {
@@ -1158,12 +1139,12 @@ onMounted(async () => {
 
 .title-item {
   color: var(--text-primary-80-color);
-  cursor: pointer;
+  // cursor: pointer;
 
-  &:hover {
-    color: var(--color-primary-100);
-    text-decoration: underline;
-  }
+  // &:hover {
+  //   color: var(--color-primary-100);
+  //   text-decoration: underline;
+  // }
 }
 
 .person-item {

src/views/dataLibrary/exportControl/entityList/index.vue

@@ -142,7 +142,7 @@
             </el-table-column>
             <el-table-column label="上市地点">
               <template #default="scope">
-                <span class="person-item text-compact" @click="handleOrgClick(scope.row)">{{ scope.row.organizationName
+                <span class="person-item text-compact">{{ scope.row.organizationName
                 }}</span>
               </template>
             </el-table-column>
@@ -1064,7 +1064,7 @@ const handleDownloadCurChartData = () => {
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
   const routeQuery = goToPage.getDecodedParams()
-  const hasQuery = Object.keys(routeQuery).length > 0;
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
     if (routeQuery.selectedAreaList) {
       selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
@@ -1113,7 +1113,7 @@ const initParam = () => {
     if (isCnEntityOnly.value) {
       selectedCountry.value = '0101'
     } else {
-      selectedCountry.value = routeQuery.selectedCountryId ? routeQuery.selectedCountryId : '全部国家'
+      selectedCountry.value = savedQuery.selectedCountryId ? routeQuery.selectedCountryId : '全部国家'
     }
 
     selectedEntityType.value = savedQuery.selectedEntityType ? entityTypeList.value.filter(item => item.name === savedQuery.selectedEntityType)[0].id : '全部实体类型'
@@ -1136,29 +1136,16 @@ watch(
 const handleClickToDetail = (curEntity) => {
   console.log('curEntity', curEntity);
 
-  window.sessionStorage.setItem("decreeId", curEntity.id);
-  window.sessionStorage.setItem("curTabName", curEntity.title);
-  const route = router.resolve({
-    name: "companyPages",
-    params: {
-      id: curEntity.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
-};
-
-// 跳转机构详情
-const handleOrgClick = item => {
-  console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
+  // window.sessionStorage.setItem("decreeId", curEntity.id);
+  // window.sessionStorage.setItem("curTabName", curEntity.title);
+  // const route = router.resolve({
+  //   name: "companyPages",
+  //   params: {
+  //     id: curEntity.organizationId
+  //   }
+  // });
+  // window.open(route.href, "_blank");
+  goToPage.goToCompanyPage(curEntity.id, curEntity.title)
 };
 
 // 导出

src/views/dataLibrary/exportControl/entityListEvent/index.vue

@@ -809,7 +809,7 @@ const initParam = () => {
   const routeQuery = goToPage.getDecodedParams()
   console.log('routequery', routeQuery);
   
-  const hasQuery = Object.keys(routeQuery).length > 0;
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
     if (routeQuery.selectedAreaList) {
       selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
@@ -851,30 +851,17 @@ const initParam = () => {
 const handleClickToDetail = (item) => {
   console.log('curEntityEvent', item);
 
-	window.sessionStorage.setItem("curTabName", `${item.date}《${item.originalTitle}》`);
-	const route = router.resolve({
-		path: "/exportControl/singleSanction",
-		query: {
-			id: item.id,
-			sanTypeId: 1,
-			date: item.date
-		}
-	});
-	window.open(route.href, "_blank");
-};
-
-// 跳转机构详情
-const handleOrgClick = item => {
-  console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
+	// window.sessionStorage.setItem("curTabName", `${item.date}《${item.originalTitle}》`);
+	// const route = router.resolve({
+	// 	path: "/exportControl/singleSanction",
+	// 	query: {
+	// 		id: item.id,
+	// 		sanTypeId: 1,
+	// 		date: item.date
+	// 	}
+	// });
+	// window.open(route.href, "_blank");
+  goToPage.goToSingleEntityEvent(item.id,`${item.date}《${item.originalTitle}》`, item.date)
 };
 
 // 导出

src/views/dataLibrary/financeControl/mREList/index.vue

@@ -161,6 +161,7 @@ import { search } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
 import { getMaterialCategory, getControlReason } from '@/api/comprehensiveSearch/index'
+import goToPage from '@/utils/goToPage'
 
 const route = useRoute();
 
@@ -883,23 +884,26 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-  const hasQuery = Object.keys(route.query).length > 0;
+  const routeQuery = goToPage.getDecodedParams()
+  console.log('routeQuery', routeQuery);
+
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
-    if (route.query.selectedAreaList) {
-      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    if (routeQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
     } else {
-      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+      selectedArea.value = routeQuery.domains ? [routeQuery.domains] : ['全部领域']
     }
 
-    if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
+    if (routeQuery.selectedDate && Array.isArray(JSON.parse(routeQuery.selectedDate)) && JSON.parse(routeQuery.selectedDate).length) {
       selectedDate.value = '自定义'
-      customTime.value = JSON.parse(route.query.selectedDate)
+      customTime.value = JSON.parse(routeQuery.selectedDate)
     }
 
-    selectedType.value = route.query.orgnizationName ? route.query.orgnizationName : '全部类别'
+    selectedType.value = routeQuery.orgnizationName ? routeQuery.orgnizationName : '全部类别'
 
 
-    const query = route.query;
+    const query = routeQuery;
     if (Object.keys(query).length > 0) {
       sessionStorage.setItem('mRListRouteQuery', JSON.stringify(query));
     }
@@ -919,29 +923,9 @@ const initParam = () => {
 
 // 跳转企业详情
 const handleClickToDetail = (curEntity) => {
-  window.sessionStorage.setItem("curTabName", curEntity.title);
-  const route = router.resolve({
-    name: "companyPages",
-    params: {
-      id: curEntity.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
+  goToPage.goToCompanyPage(curEntity.organizationId, curEntity.title)
 };
 
-// 跳转机构详情
-const handleOrgClick = item => {
-  console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
-};
 
 // 导出
 const handleExport = () => {

src/views/dataLibrary/financeControl/mREListEvent/index.vue

@@ -151,6 +151,7 @@ import router from '@/router'
 import { search } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
+import goToPage from '@/utils/goToPage'
 
 const route = useRoute();
 
@@ -804,23 +805,26 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-  const hasQuery = Object.keys(route.query).length > 0;
+  const routeQuery = goToPage.getDecodedParams()
+  console.log('routeQuery',routeQuery);
+  
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
-    if (route.query.selectedAreaList) {
-      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    if (routeQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
     } else {
-      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+      selectedArea.value = routeQuery.domains ? [routeQuery.domains] : ['全部领域']
     }
 
-    if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
+    if (routeQuery.selectedDate && Array.isArray(JSON.parse(routeQuery.selectedDate)) && JSON.parse(routeQuery.selectedDate).length) {
       selectedDate.value = '自定义'
-      customTime.value = JSON.parse(route.query.selectedDate)
+      customTime.value = JSON.parse(routeQuery.selectedDate)
     }
 
-    isInvolveCnOnly.value = route.query.isInvolveCnOnly ? true : false
+    isInvolveCnOnly.value = routeQuery.isInvolveCnOnly ? true : false
 
 
-    const query = route.query;
+    const query = routeQuery;
     if (Object.keys(query).length > 0) {
       sessionStorage.setItem('mRListEventRouteQuery', JSON.stringify(query));
     }
@@ -842,35 +846,13 @@ const initParam = () => {
 
 }
 
-// 跳转政令详情
-const handleClickToDetail = (curDecree) => {
-  console.log('curDecree', curDecree);
-
-  window.sessionStorage.setItem("decreeId", curDecree.id);
-  window.sessionStorage.setItem("curTabName", curDecree.title);
-  const route = router.resolve({
-    path: "/decreeLayout",
-    query: {
-      id: curDecree.id
-    }
-  });
-  window.open(route.href, "_blank");
-};
-
-// 跳转机构详情
-const handleOrgClick = item => {
+// 跳转详情
+const handleClickToDetail = (item) => {
   console.log('item', item);
 
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
 };
 
+
 // 导出
 const handleExport = () => {
   if (!selectedCount.value) {

src/views/dataLibrary/financeControl/sDNList/index.vue

@@ -188,6 +188,7 @@ import { search } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
 import { getProvinceList, getCountryList, getEntityTypes } from '@/api/comprehensiveSearch/index'
+import goToPage from '@/utils/goToPage'
 
 const route = useRoute();
 
@@ -1063,34 +1064,37 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-  const hasQuery = Object.keys(route.query).length > 0;
+  const routeQuery = goToPage.getDecodedParams()
+  console.log('routeQuery',routeQuery);
+  
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
-    if (route.query.selectedAreaList) {
-      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    if (routeQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
     } else {
-      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+      selectedArea.value = routeQuery.domains ? [routeQuery.domains] : ['全部领域']
     }
 
-    if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
+    if (routeQuery.selectedDate && Array.isArray(JSON.parse(routeQuery.selectedDate)) && JSON.parse(routeQuery.selectedDate).length) {
       selectedDate.value = '自定义'
-      customTime.value = JSON.parse(route.query.selectedDate)
+      customTime.value = JSON.parse(routeQuery.selectedDate)
     }
 
-    selectedProvince.value = route.query.selectedProvince ? provinceList.value.filter(item => item.name.indexOf(route.query.selectedProvince) > -1)[0].name : '全部省份'
+    selectedProvince.value = routeQuery.selectedProvince ? provinceList.value.filter(item => item.name.indexOf(routeQuery.selectedProvince) > -1)[0].name : '全部省份'
 
 
-    isHalfRule.value = route.query.isHalfRule === 'true' ? true : false
+    isHalfRule.value = routeQuery.isHalfRule === 'true' ? true : false
 
-    isCnEntityOnly.value = route.query.isCnEntityOnly ? true : false
+    isCnEntityOnly.value = routeQuery.isCnEntityOnly ? true : false
     if (isCnEntityOnly.value) {
       selectedCountry.value = '0101'
     } else {
-      selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
+      selectedCountry.value = routeQuery.selectedCountryId ? routeQuery.selectedCountryId : '全部国家'
     }
 
-    selectedEntityType.value = route.query.selectedEntityType ? entityTypeList.value.filter(item => item.name === route.query.selectedEntityType)[0].id : '全部实体类型'
+    selectedEntityType.value = routeQuery.selectedEntityType ? entityTypeList.value.filter(item => item.name === routeQuery.selectedEntityType)[0].id : '全部实体类型'
 
-    const query = route.query;
+    const query = routeQuery;
     if (Object.keys(query).length > 0) {
       sessionStorage.setItem('sDNListRouteQuery', JSON.stringify(query));
     }
@@ -1112,7 +1116,7 @@ const initParam = () => {
     if (isCnEntityOnly.value) {
       selectedCountry.value = '0101'
     } else {
-      selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
+      selectedCountry.value = savedQuery.selectedCountryId ? routeQuery.selectedCountryId : '全部国家'
     }
 
     selectedEntityType.value = savedQuery.selectedEntityType ? entityTypeList.value.filter(item => item.name === savedQuery.selectedEntityType)[0].id : '全部实体类型'

src/views/dataLibrary/financeControl/sDNListEvent/index.vue

@@ -152,6 +152,7 @@ import router from '@/router'
 import { search } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
+import goToPage from '@/utils/goToPage'
 
 const route = useRoute();
 
@@ -805,23 +806,26 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-  const hasQuery = Object.keys(route.query).length > 0;
+  const routeQuery = goToPage.getDecodedParams()
+  console.log('routeQuery',routeQuery);
+  
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
-    if (route.query.selectedAreaList) {
-      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    if (routeQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(routeQuery.selectedAreaList)
     } else {
-      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+      selectedArea.value = routeQuery.domains ? [routeQuery.domains] : ['全部领域']
     }
 
-    if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
+    if (routeQuery.selectedDate && Array.isArray(JSON.parse(routeQuery.selectedDate)) && JSON.parse(routeQuery.selectedDate).length) {
       selectedDate.value = '自定义'
-      customTime.value = JSON.parse(route.query.selectedDate)
+      customTime.value = JSON.parse(routeQuery.selectedDate)
     }
 
-    isInvolveCnOnly.value = route.query.isInvolveCnOnly ? true : false
+    isInvolveCnOnly.value = routeQuery.isInvolveCnOnly ? true : false
 
 
-    const query = route.query;
+    const query = routeQuery;
     if (Object.keys(query).length > 0) {
       sessionStorage.setItem('sDNListEventRouteQuery', JSON.stringify(query));
     }
@@ -874,19 +878,6 @@ const handleClickToDetail = (curEntityEvent) => {
   // window.open(routeData.href, "_blank");
 };
 
-// 跳转机构详情
-const handleOrgClick = item => {
-  console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
-};
 
 // 导出
 const handleExport = () => {

src/views/dataLibrary/institution/index.vue

@@ -149,7 +149,7 @@ import { search } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
 import { getProvinceList, getCountryList, getEntityTypes } from '@/api/comprehensiveSearch/index'
-
+import goToPage from '@/utils/goToPage'
 const route = useRoute();
 
 // 图表/数据
@@ -793,14 +793,15 @@ const initParam = () => {
 // 跳转机构详情
 const handleClickToDetail = (item) => {
   console.log('item', item);
-  window.sessionStorage.setItem("curTabName", item.originalTitle);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.id
-    }
-  });
-  window.open(route.href, "_blank");
+  // window.sessionStorage.setItem("curTabName", item.originalTitle);
+  // const route = router.resolve({
+  //   path: "/institution",
+  //   query: {
+  //     id: item.id
+  //   }
+  // });
+  // window.open(route.href, "_blank");
+  goToPage.goToInstitution(item.id, item.originalTitle)
 };
 
 

src/views/dataLibrary/news/index.vue

@@ -154,6 +154,7 @@ import { search } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
 import { useGotoNewsDetail } from "@/router/modules/news";
+import goToPage from '@/utils/goToPage'
 const gotoNewsDetail = useGotoNewsDetail();
 
 const route = useRoute();
@@ -819,16 +820,11 @@ const initParam = () => {
 const handleClickToDetail = (item) => {
   console.log('item', item);
 
-  window.sessionStorage.setItem("curTabName", item.originalTitle);
+  // window.sessionStorage.setItem("curTabName", item.originalTitle);
 
-  gotoNewsDetail(item.id);
-  // const route = router.resolve({
-  // 	path: "/newsAnalysis",
-  // 	query: {
-  // 		newsId: item.id
-  // 	}
-  // });
-  // window.open(route.href, "_blank");
+  // gotoNewsDetail(item.id);
+
+  goToPage.goToNewsPage(item.id, item.originalTitle)
 };
 
 // 导出

src/views/dataLibrary/technologyFigures/index.vue

@@ -156,6 +156,7 @@ import { search } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 
 import { getPersonType, getCountryList, getThinkTankList } from "@/api/comprehensiveSearch/index"
+import goToPage from '@/utils/goToPage'
 
 const route = useRoute();
 
@@ -872,28 +873,15 @@ const initParam = () => {
 
 // 跳转人物详情
 const handleClickToDetail = (item) => {
-  window.sessionStorage.setItem('curTabName', item.name)
-  const routeData = router.resolve({
-    path: "/characterPage",
-    query: {
-      personId: item.id
-    }
-  });
-  window.open(routeData.href, "_blank");
-};
-
-// 跳转机构详情
-const handleOrgClick = item => {
-  console.log('item', item);
-
-  window.sessionStorage.setItem("curTabName", item.organizationName);
-  const route = router.resolve({
-    path: "/institution",
-    query: {
-      id: item.organizationId
-    }
-  });
-  window.open(route.href, "_blank");
+  // window.sessionStorage.setItem('curTabName', item.name)
+  // const routeData = router.resolve({
+  //   path: "/characterPage",
+  //   query: {
+  //     personId: item.id
+  //   }
+  // });
+  // window.open(routeData.href, "_blank");
+  goToPage.goToCharacterPage(item.id, item.name)
 };
 
 // 导出

src/views/dataLibrary/thinkTank/index.vue

@@ -911,7 +911,8 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-  const hasQuery = Object.keys(route.query).length > 0;
+  const routeQuery = goToPage.getDecodedParams()
+  const hasQuery = routeQuery ? Object.keys(routeQuery).length > 0 : false
   if (hasQuery) {
     const decodedQuery = route.query.data ? (goToPage.getDecodedParams() || {}) : null;
     const query = decodedQuery && typeof decodedQuery === "object" ? decodedQuery : route.query;
@@ -975,29 +976,31 @@ const encodeBase64Param = (val) => {
 const handleClickToDetail = curReport => {
   console.log("curReport", curReport);
 
-  window.sessionStorage.setItem("billId", curReport.id);
-  window.sessionStorage.setItem("curTabName", curReport.title);
-  const encodedId = encodeBase64Param(curReport?.id);
-  if (!encodedId) return;
-  const route = router.resolve({
-    name: "ReportDetail",
-    params: {
-      id: encodedId
-    }
-  });
-  window.open(route.href, "_blank");
+  // window.sessionStorage.setItem("billId", curReport.id);
+  // window.sessionStorage.setItem("curTabName", curReport.id);
+  // const encodedId = encodeBase64Param(curReport?.id);
+  // if (!encodedId) return;
+  // const route = router.resolve({
+  //   name: "ReportDetail",
+  //   params: {
+  //     id: encodedId
+  //   }
+  // });
+  // window.open(route.href, "_blank");
+  goToPage.goToThinkTankReport(curReport.id, curReport.id)
 };
 
 // 跳转智库详情
 const handlePerClick = item => {
-  const curRoute = router.resolve({
-    name: "ThinkTankDetail",
-    params: {
-      id: item.organizationId,
-      name: item.organizationName
-    }
-  });
-  window.open(curRoute.href, "_blank");
+  // const curRoute = router.resolve({
+  //   name: "ThinkTankDetail",
+  //   params: {
+  //     id: item.organizationId,
+  //     name: item.organizationName
+  //   }
+  // });
+  // window.open(curRoute.href, "_blank");
+  goToPage.goToThinkTank(item.organizationId, item.organizationName)
 };
 
 // 导出

src/views/home/index.vue

@@ -43,13 +43,6 @@
 				</el-tooltip>
 			</div>
 
-			<!-- <div class="ai-btn" @click="openAiBox">
-				<div class="icon">
-					<img src="@/assets/icons/ai-icon.png" alt="" />
-				</div>
-				<div class="text">智能问答</div>
-			</div> -->
-
 			<div class="ai-dialog" v-if="isShowAiBox">
 				<AiBox @close="closeAiBox" />
 			</div>
@@ -86,10 +79,6 @@ const closeAiBox = () => {
 	isShowAiBox.value = false;
 };
 
-const openAiBox = () => {
-	isShowAiBox.value = true;
-};
-
 const personTypeList = ref([]);
 
 // 获取人物类别