feat:update

src/components/SearchContainer.vue

@@ -62,7 +62,7 @@ import { ref, nextTick, watchEffect } from "vue";
 import { useContainerScroll } from "@/hooks/useScrollShow";
 import { useRouter } from "vue-router";
 import { useWrittingAsstaintStore } from "@/stores/writtingAsstaintStore";
-import { goToSearch } from "@/utils/goToPage";
+import goToPage from "@/utils/goToPage";
 
 const store = useWrittingAsstaintStore();
 const router = useRouter();
@@ -129,9 +129,9 @@ const handleSearch = () => {
 	// window.open(curRoute.href, "_blank");
 
 	if (enableBillTypeSwitch) {
-		goToSearch(store.searchBillText, areaName, billSearchType.value)
+		goToPage.goToSearch(store.searchBillText, areaName, billSearchType.value)
 	} else {
-		goToSearch(store.searchBillText, areaName)
+		goToPage.goToSearch(store.searchBillText, areaName)
 	}	
 
 };

src/components/layout/SearchBar.vue

@@ -49,7 +49,7 @@
 import { onMounted, ref, computed, onUnmounted, nextTick, watch, watchEffect } from "vue";
 import router from "@/router/index";
 import { useWrittingAsstaintStore } from "@/stores/writtingAsstaintStore";
-import { goToSearch } from "@/utils/goToPage";
+import goToPage from "@/utils/goToPage";
 
 const store = useWrittingAsstaintStore();
 const handleSearch = () => {
@@ -63,7 +63,7 @@ const handleSearch = () => {
 	// 	}
 	// });
 	// window.open(curRoute.href, "_blank");
-	goToSearch(store.searchBillText, store.searchData.areaName)
+	goToPage.goToSearch(store.searchBillText, store.searchData.areaName)
 
 };
 let containerRef = computed(() => store.searchData.containerRef);

src/utils/goToPage/methods/getDecode.js

 // 解码
+import router from "@/router";
 export const getDecodedParams = () => {
   if (window.location.search) {
     const urlParams = new URLSearchParams(window.location.search)

src/views/bill/billHome/ResourceLibrarySection.vue

@@ -283,7 +283,7 @@ import cyyIcon from "@/assets/icons/cyy.png";
 import ghdIcon from "@/assets/icons/ghd.png";
 import mzdIcon from "@/assets/icons/mzd.png";
 import { ElMessage } from "element-plus";
-import { goToDataCountryBill } from "@/utils/goToPage";
+import { goToDataCountryBill } from "@/utils/goToPage1";
 
 const router = useRouter();
 

src/views/bill/billHome/index.vue

@@ -322,7 +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";
+import { goToBill } from "@/utils/goToPage1";
 
 // 跳转人物主页（MessageBubble 的 person-click 传入整条列表项，需取 personId）
 const handleClickToCharacter = async item => {

src/views/comprehensiveSearch/searchResults/index.vue

@@ -132,8 +132,7 @@ import { getPersonSummaryInfo } from "@/api/common/index";
 import { ElMessage } from "element-plus";
 import TimeSortSelectBox from '@/components/base/TimeSortSelectBox/index.vue'
 import AreaTag from '@/components/base/AreaTag/index.vue'
-import { getDecodedParams } from "@/utils/goToPage";
-
+import goToPage from "@/utils/goToPage";
 const route = useRoute();
 const container = ref(null)
 const isLoading = ref(false)
@@ -598,7 +597,7 @@ const handleToPage = async item => {
 };
 
 onMounted(() => {
-	const routeQuery = getDecodedParams()
+	const routeQuery = goToPage.getDecodedParams()
 	console.log('routeQuery',routeQuery);
 	
 

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

@@ -173,7 +173,6 @@ import { getPostOrgList, getPostMemberList } from '@/api/bill/billHome'
 import { search, getStatusList } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
-import { getDecodedParams } from '@/utils/goToPage'
 import goToPage from '@/utils/goToPage/index'
 
 const route = useRoute();

src/views/dataLibrary/decree/index.vue

@@ -186,7 +186,7 @@ import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
 
 import { getDepartmentList } from "@/api/decree/home";
-import { getDecodedParams } from '@/utils/goToPage'
+
 import goToPage from '@/utils/goToPage/index'
 
 const route = useRoute();
@@ -977,7 +977,7 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-    const routeQuery = goToPage.getDecodedParams()
+  const routeQuery = goToPage.getDecodedParams()
   const hasQuery = Object.keys(routeQuery).length > 0;
   if (hasQuery) {
     if (routeQuery.selectedAreaList) {

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

@@ -9,8 +9,9 @@
           @update:custom-time="handleCustomDate" />
         <SelectBox v-if="isFolderAll" :placeholder-name="typePlaceHolder" select-title="物项类别" :select-list="typeList"
           :select-name="selectedType" @update:select-text="handleSelectType" />
-        <SelectBox v-if="isFolderAll" :placeholder-name="updateFlagPlaceHolder" select-title="变动标识" :select-list="updateFlagList"
-          :select-name="selectedUpdateFlag" @update:select-text="handleSelectUpdateFlag" />
+        <SelectBox v-if="isFolderAll" :placeholder-name="updateFlagPlaceHolder" select-title="变动标识"
+          :select-list="updateFlagList" :select-name="selectedUpdateFlag"
+          @update:select-text="handleSelectUpdateFlag" />
         <SelectBox v-if="isFolderAll" :placeholder-name="controlReasonPlaceHolder" select-title="管控原因"
           :select-list="controlReasonList" :select-name="selectedControlReason"
           @update:select-text="handleSelectControlReason" />
@@ -163,7 +164,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/index'
 const route = useRoute();
 
 // 图表/数据
@@ -338,7 +339,7 @@ const activeTagList = computed(() => {
       }
     )
   }
-    if (selectedUpdateFlag.value && selectedUpdateFlag.value !== '全部标识') {
+  if (selectedUpdateFlag.value && selectedUpdateFlag.value !== '全部标识') {
     arr.push(
       {
         tag: '变动标识',
@@ -920,24 +921,25 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-  const hasQuery = Object.keys(route.query).length > 0;
+  const routeQuery = goToPage.getDecodedParams()
+  const hasQuery = Object.keys(routeQuery).length > 0;
   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 : '全部类别'
 
-    selectedUpdateFlag.value = route.query.updateFlag ? route.query.updateFlag : '全部标识'
+    selectedUpdateFlag.value = routeQuery.updateFlag ? routeQuery.updateFlag : '全部标识'
 
-    const query = route.query;
+    const query = routeQuery;
     if (Object.keys(query).length > 0) {
       sessionStorage.setItem('commerceRouteQuery', JSON.stringify(query));
     }

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

@@ -151,7 +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/index'
 const route = useRoute();
 
 // 图表/数据
@@ -804,23 +804,24 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-  const hasQuery = Object.keys(route.query).length > 0;
+  const routeQuery = goToPage.getDecodedParams()
+  const hasQuery = Object.keys(routeQuery).length > 0;
   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('commerceEventRouteQuery', JSON.stringify(query));
     }

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

@@ -188,7 +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/index'
 const route = useRoute();
 
 const isShowProvinceBox = computed(() => {
@@ -1063,34 +1063,35 @@ const handleDownloadCurChartData = () => {
 
 // 跳转到当前页 初始化筛选条件
 const initParam = () => {
-  const hasQuery = Object.keys(route.query).length > 0;
+  const routeQuery = goToPage.getDecodedParams()
+  const hasQuery = Object.keys(routeQuery).length > 0;
   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('entityRouteQuery', JSON.stringify(query));
     }
@@ -1112,7 +1113,7 @@ const initParam = () => {
     if (isCnEntityOnly.value) {
       selectedCountry.value = '0101'
     } else {
-      selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
+      selectedCountry.value = routeQuery.selectedCountryId ? routeQuery.selectedCountryId : '全部国家'
     }
 
     selectedEntityType.value = savedQuery.selectedEntityType ? entityTypeList.value.filter(item => item.name === savedQuery.selectedEntityType)[0].id : '全部实体类型'

src/views/dataLibrary/exportControl/entityListEvent/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/index'
 
 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 = Object.keys(routeQuery).length > 0;
   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('entityEventRouteQuery', JSON.stringify(query));
     }

src/views/dataLibrary/thinkTank/index.vue

@@ -172,13 +172,13 @@ import InputBox from "../components/InputBox/index.vue";
 import DataChartSwitchBox from '../components/dataChartSwitchBox/index.vue'
 import { useRoute } from "vue-router";
 import router from "@/router";
-import { getDecodedParams } from "@/utils/goToPage";
 
 import { search, getThinkTankList } from "@/api/comprehensiveSearch";
 import { ElMessage } from "element-plus";
 import getDateRange from "@/utils/getDateRange";
 
 import { getDepartmentList } from "@/api/decree/home";
+import goToPage from "@/utils/goToPage";
 
 const route = useRoute();
 
@@ -913,7 +913,7 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    const decodedQuery = route.query.data ? (getDecodedParams() || {}) : null;
+    const decodedQuery = route.query.data ? (goToPage.getDecodedParams() || {}) : null;
     const query = decodedQuery && typeof decodedQuery === "object" ? decodedQuery : route.query;
 
     if (query.selectedAreaList) {

src/views/exportControl/components/info.vue

@@ -21,23 +21,29 @@
 <script setup>
 import infoIcon from "../assets/icons/info-icon.png";
 import { useRouter } from "vue-router";
+import goToPage from "@/utils/goToPage/index";
 const router = useRouter()
 const emits = defineEmits(['num-click'])
 
 const handleClickNum = (item) => {
 	if (item === '实体清单') {
-		const route = router.resolve({
-			path: "/dataLibrary/dataEntityList",
-			query: {
-				isCnEntityOnly: true
-			}
-		});
-		window.open(route.href, "_blank");
+		// const route = router.resolve({
+		// 	path: "/dataLibrary/dataEntityList",
+		// 	query: {
+		// 		isCnEntityOnly: true
+		// 	}
+		// });
+		// window.open(route.href, "_blank");
+		const params = {
+			isCnEntityOnly: true
+		}
+		goToPage.goToDataEntityList(params)
 	} else if (item === '商业管制清单') {
-		const route = router.resolve({
-			path: "/dataLibrary/dataCommerceControlList",
-		});
-		window.open(route.href, "_blank");
+		// const route = router.resolve({
+		// 	path: "/dataLibrary/dataCommerceControlList",
+		// });
+		// window.open(route.href, "_blank");
+		goToPage.goToDataCCLList()
 	}
 }
 
@@ -157,7 +163,8 @@ const desMap = {
 	display: flex;
 	flex-direction: column;
 	align-items: flex-end;
-	&:hover{
+
+	&:hover {
 		text-decoration: underline;
 		background: var(--color-primary-2);
 	}

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

@@ -173,7 +173,7 @@ import { ArrowDown } from "@element-plus/icons-vue";
 import CommonPrompt from "../../../../../commonPrompt/index.vue";
 import { getEntityInfo, getPublishInfo, getPublishOrgInfo, getEntityUpdateInfo } from "@/api/exportControlV2.0.js";
 import { useRoute } from "vue-router";
-
+import goToPage from "@/utils/goToPage/index";
 const route = useRoute();
 // 处理点击发布机构的方法
 const handleClickOrg = item => {
@@ -410,11 +410,12 @@ const handleToDataLibrary = item => {
 			selectedDate: JSON.stringify([item.postDate, item.postDate])
 		};
 	}
-	const route = router.resolve({
-		path: "/dataLibrary/dataEntityList",
-		query: params
-	});
-	window.open(route.href, "_blank");
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/dataEntityList",
+	// 	query: params
+	// });
+	// window.open(route.href, "_blank");
+	goToPage.goToDataEntityList(params)
 };
 
 onMounted(() => {

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

@@ -192,6 +192,7 @@ import { getExportControlList, get50PercentEntityCount } from "@/api/exportContr
 import CommonPrompt from "@/views/exportControl/commonPrompt/index.vue";
 import { useGotoCompanyPages } from "@/router/modules/company";
 import TimeSortSelectBox from "@/components/base/TimeSortSelectBox/index.vue";
+import goToPage from "@/utils/goToPage/index";
 const gotoCompanyPages = useGotoCompanyPages();
 const router = useRouter();
 
@@ -531,22 +532,24 @@ const handlToDataLibrary = () => {
 	const params = {
 		isCnEntityOnly: true
 	};
-	const route = router.resolve({
-		path: "/dataLibrary/dataEntityList",
-		query: params
-	});
-	window.open(route.href, "_blank");
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/dataEntityList",
+	// 	query: params
+	// });
+	// window.open(route.href, "_blank");
+	goToPage.goToDataEntityList(params)
 };
 const handlToDataLibrary1 = () => {
 	const params = {
 		isCnEntityOnly: true,
 		isHalfRule: true
 	};
-	const route = router.resolve({
-		path: "/dataLibrary/dataEntityList",
-		query: params
-	});
-	window.open(route.href, "_blank");
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/dataEntityList",
+	// 	query: params
+	// });
+	// window.open(route.href, "_blank");
+	goToPage.goToDataEntityList(params)
 };
 </script>
 

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

@@ -243,7 +243,7 @@ import {
 } from "@/api/exportControlV2.0";
 import RuleSubsidiaryDialog from "../../../v2.0EntityList/components/sanctionsOverview/components/listPage/RuleSubsidiaryDialog.vue";
 import { useRoute } from "vue-router";
-
+import goToPage from "@/utils/goToPage/index";
 import { useGotoCompanyPages } from "@/router/modules/company";
 const gotoCompanyPages = useGotoCompanyPages();
 
@@ -570,14 +570,19 @@ const handleToDataLibrary = item => {
 		(_, y, m, d) => `${y}-${m.padStart(2, "0")}-${d.padStart(2, "0")}`
 	);
 
-	const route = router.resolve({
-		path: "/dataLibrary/dataEntityList",
-		query: {
-			selectedDate: JSON.stringify([dateStr, dateStr]),
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/dataEntityList",
+	// 	query: {
+	// 		selectedDate: JSON.stringify([dateStr, dateStr]),
+	// 		selectedCountryId: item.id
+	// 	}
+	// });
+	// window.open(route.href, "_blank");
+	const params = {
+					selectedDate: JSON.stringify([dateStr, dateStr]),
 			selectedCountryId: item.id
-		}
-	});
-	window.open(route.href, "_blank");
+	}
+	goToPage.goToDataEntityList(params)
 };
 
 onMounted(() => {

src/views/finance/entityList/components/dataStatistics/index.vue

@@ -104,7 +104,8 @@
 							</div>
 						</div>
 					</template>
-					<EChart :option="sanctionCountChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" @chart-click="handleToDataLibrary4"  />
+					<EChart :option="sanctionCountChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }"
+						@chart-click="handleToDataLibrary4" />
 
 					<div class="data-origin-box">
 						<div class="data-origin-icon">
@@ -165,7 +166,8 @@
 							<el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
 					</template>
-					<EChart :option="domainChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" @chart-click="handleToDataLibrary6" />
+					<EChart :option="domainChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }"
+						@chart-click="handleToDataLibrary6" />
 
 					<div class="data-origin-box">
 						<div class="data-origin-icon">
@@ -199,7 +201,8 @@
 							</div>
 						</div>
 					</template>
-					<EChart :option="domainNumChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" @chart-click="handleToDataLibrary5" />
+					<EChart :option="domainNumChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }"
+						@chart-click="handleToDataLibrary5" />
 
 					<div class="data-origin-box">
 						<div class="data-origin-icon">
@@ -223,7 +226,8 @@
 						</el-select>
 					</template>
 					<!-- <div class="echarts" ref="typeChartRef"></div> -->
-					<EChart :option="typeChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" @chart-click="handleToDataLibrary7" />
+					<EChart :option="typeChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }"
+						@chart-click="handleToDataLibrary7" />
 					<!-- <div class="bottom">
 						<div class="ai">
 							<div class="left">
@@ -275,6 +279,7 @@ import tipsIcon from "../../../assets/icons/info-icon.png";
 import AiButton from "@/components/base/Ai/AiButton/index.vue";
 import AiPane from "@/components/base/Ai/AiPane/index.vue";
 import { useChartInterpretation } from "@/views/exportControl/utils/common";
+import goToPage from "@/utils/goToPage/index";
 const sanctionCountChart = useChartInterpretation();
 const domainChart = useChartInterpretation();
 const domainNumChart = useChartInterpretation();
@@ -1329,7 +1334,7 @@ const handleToDataLibrary4 = val => {
 // 制裁实体各省分布情况
 const handleToDataLibrary5 = item => {
 	console.log('item', item);
-	
+
 	const params = {
 		domains: item.seriesName,
 		isCnEntityOnly: true,
@@ -1352,11 +1357,12 @@ const handleToDataLibrary6 = val => {
 		selectedDate:
 			domainTime.value === "all" ? null : JSON.stringify([domainTime.value + "-01-01", domainTime.value + "-12-31"])
 	};
-	const route = router.resolve({
-		path: "/dataLibrary/dataEntityList",
-		query: params
-	});
-	window.open(route.href, "_blank");
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/dataEntityList",
+	// 	query: params
+	// });
+	// window.open(route.href, "_blank");
+	goToPage.goToDataEntityList(params)
 };
 
 // 制裁实体类型分布情况
@@ -1367,11 +1373,12 @@ const handleToDataLibrary7 = val => {
 		selectedEntityType: val.name,
 		selectedDate: typeTime.value === "all" ? null : JSON.stringify([typeTime.value + "-01-01", typeTime.value + "-12-31"])
 	};
-	const route = router.resolve({
-		path: "/dataLibrary/dataEntityList",
-		query: params
-	});
-	window.open(route.href, "_blank");
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/dataEntityList",
+	// 	query: params
+	// });
+	// window.open(route.href, "_blank");
+	goToPage.goToDataEntityList(params)
 }
 
 onMounted(() => {
@@ -1837,6 +1844,7 @@ onMounted(() => {
 	right: 0px;
 	bottom: 15px;
 	z-index: 999;
+
 	:deep(.ai-pane-wrapper) {
 		display: none;
 	}

src/views/home/index.vue

@@ -66,18 +66,7 @@ import { getPersonType } from "@/api/common/index";
 // import { useDraggable } from "@vueuse/core";
 import ModuleHeader from '@/components/base/moduleHeader/index.vue'
 
-import Menu1 from "@/assets/icons/overview/menu1.png";
-import Menu2 from "@/assets/icons/overview/menu2.png";
-import Menu3 from "@/assets/icons/overview/menu3.png";
-import Menu4 from "@/assets/icons/overview/menu4.png";
-import Menu5 from "@/assets/icons/overview/menu5.png";
-import Menu6 from "@/assets/icons/overview/menu6.png";
-import Menu7 from "@/assets/icons/overview/menu7.png";
-import Menu8 from "@/assets/icons/overview/menu8.png";
-import Menu9 from "@/assets/icons/overview/menu9.png";
-import Menu10 from "@/assets/icons/overview/menu10.png";
-import Menu11 from "@/assets/icons/overview/menu11.png";
-import Menu12 from "@/assets/icons/overview/menu12.png";
+
 import { ElMessage } from "element-plus";
 
 const router = useRouter();
@@ -117,115 +106,6 @@ const handleGetPersonType = async () => {
 	} catch (error) { }
 };
 
-const isCurrentOverview = computed(() => {
-	if (route.path === "/ZMOverView") {
-		return true;
-	} else {
-		return false;
-	}
-});
-
-
-
-const isShowMenu = ref(false);
-const handleShowMenu = (index, isShow) => {
-	if (index === 0) {
-		isShowMenu.value = isShow;
-	}
-};
-
-const handleHoverMenu = isShow => {
-	isShowMenu.value = isShow;
-};
-
-const menuList = ref([
-	{
-		title: "中美科技博弈概览",
-		icon: Menu1,
-		path: "/ZMOverView"
-	},
-	{
-		title: "科技法案",
-		icon: Menu2,
-		path: "/billHome"
-	},
-	{
-		title: "科技政令",
-		icon: Menu3,
-		path: "/decree"
-	},
-	{
-		title: "美国科技智库",
-		icon: Menu4,
-		path: "/thinkTank"
-	},
-	{
-		title: "出口管制",
-		icon: Menu5,
-		path: "/exportControl"
-	},
-	{
-		title: "科研合作限制",
-		icon: Menu6,
-		path: "/cooperationRestrictions"
-	},
-	{
-		title: "投融资限制",
-		icon: Menu7,
-		path: "/finance"
-	},
-	{
-		title: "市场准入限制",
-		icon: Menu8,
-		path: "/marketAccessRestrictions"
-	},
-	{
-		title: "规则限制",
-		icon: Menu9,
-		path: "/ruleRestrictions"
-	},
-	{
-		title: "美国科技人物观点",
-		icon: Menu10,
-		path: "/technologyFigures"
-	},
-	{
-		title: "美国主要创新主体动向",
-		icon: Menu11,
-		path: "/innovationSubject"
-	},
-	{
-		title: "美国科研资助体系",
-		icon: Menu12,
-		path: "/scientificFunding"
-	}
-]);
-
-const handleToModule = item => {
-	const curRoute = router.resolve({
-		path: item.path
-	});
-	window.open(curRoute.href, "_blank");
-};
-
-const searchText = ref("");
-
-const handleSearch = () => {
-	const curRoute = router.resolve({
-		path: "/searchResults",
-		query: {
-			searchText: searchText.value
-		}
-	});
-	window.open(curRoute.href, "_blank");
-};
-
-const handleClickTitle = item => {
-	if (item.name === "主要国家科技动向感知" || item.name === "主要国家竞争科技安全") {
-		ElMessage.warning("当前功能正在开发中，敬请期待！");
-	}
-};
-
 const handleOpenPage = page => {
 	const pageObj = {
 		znwd: "/chat",

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

@@ -293,10 +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";
+import goToPage from "@/utils/goToPage";
 
 const router = useRouter();
-const thinkTankId = computed(() => getDecodedParams());
+const thinkTankId = computed(() => goToPage.getDecodedParams());
 
 const loading = ref(false);
 const pageScrollRef = ref(null);

src/views/thinkTank/ThinkTankDetail/index.vue

@@ -64,7 +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";
+import goToPage from "@/utils/goToPage";
 
 const router = useRouter();
 const tabActiveName = ref("智库动态");
@@ -75,7 +75,7 @@ const switchTab = name => {
 const thinkTank = ref({});
 // 获取智库基本信息
 const handleGetThinkTankSummary = async () => {
-	const id = getDecodedParams()
+	const id = goToPage.getDecodedParams()
 
 	try {
 		const parmas = {

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

@@ -78,11 +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";
+import goToPage from "@/utils/goToPage";
 const router = useRouter();
-const thinkTankId = computed(() => getDecodedParams());
+const thinkTankId = computed(() => goToPage.getDecodedParams());
 const isThinkTankReport = ref(true);
 const isSurveyForm = ref(false);
 const isCongressHearing = ref(false);

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

@@ -259,7 +259,6 @@ 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,
@@ -273,9 +272,10 @@ import { useRouter } from "vue-router";
 
 import DefaultIcon1 from '@/assets/icons/default-icon1.png'
 import { getPersonSummaryInfo } from "@/api/common/index";
+import goToPage from "@/utils/goToPage";
 const totalPersonNumber = ref(0)
 const router = useRouter();
-const thinkTankId = getDecodedParams();
+const thinkTankId = goToPage.getDecodedParams();
 import InfoImg from "./images/img.png";
 import Icon1 from "./images/icon1.png";
 import Icon2 from "./images/icon2.png";

src/views/thinkTank/index.vue

@@ -504,7 +504,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";
+import { goToThinkTank } from "@/utils/goToPage1";
 const gotoNewsDetail = useGotoNewsDetail()
 const containerRef = ref(null);
 const isRiskDetailVisible = ref(false);