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

src/components/base/moduleHeader/index.vue

@@ -383,9 +383,9 @@ const handleToModule = (item, index) => {
 	} else {
 		const curRoute = router.resolve({
 			path: item.path,
-			query: {
-				titleIndex: 2
-			}
+			// query: {
+			// 	titleIndex: 2
+			// }
 		});
 		window.open(curRoute.href, "_blank");
 	}

src/views/bill/billHome/ResourceLibrarySection.vue

@@ -81,7 +81,7 @@
 					<template v-if="activeTabName === '国会法案'">
 						<div class="right-main-box" v-for="item in bills" :key="item.billId">
 							<div v-if="item.riskSignal" class="risk-tag" :class="getRiskTagClass(item.riskSignal)">{{ item.riskSignal
-								}}</div>
+							}}</div>
 							<div class="bill-cover">
 								<img class="bill-image" :src="getBillImageUrl(item)" alt="" @error="handleBillImageError" />
 								<div class="bill-id" :title="item.billId">{{ item.billId || "-" }}</div>
@@ -859,11 +859,42 @@ const handleCommitteeCurrentChange = page => {
 
 // 议员合作关系跳转至数据资源库
 const handleCooperationToDataLibrary = (item) => {
-	console.log('item', item);
-	console.log('activeAreaList', activeAreaList.value);
-	console.log('areaOptions', areaOptions.value);
-	
-	
+	// console.log('item', item);
+	// console.log('activeAreaList', activeAreaList.value);
+	// console.log('areaOptions', areaOptions.value);
+	// console.log('footerSelect1', footerSelect1.value);
+	// console.log('委员会列表', postOrgList.value);
+	const postOrgStr = postOrgList.value.filter(item => item.departmentId === footerSelect1.value)[0].departmentName
+	const areaList = activeAreaList.value.map(item => {
+		return areaOptions.value.filter(val => val.id === item)[0].name
+	})
+	const memberList = [item.left.name, item.right.name]
+	console.log(postOrgStr, areaList, memberList);
+
+	let param
+
+	if (areaList.length > 2) {
+		param = {
+			selectedOrg: postOrgStr,
+			selectedmember: JSON.stringify(memberList),
+			selectedAreaList: JSON.stringify(areaList)
+		}
+	} else {
+		param = {
+			selectedOrg: postOrgStr,
+			selectedmember: JSON.stringify(memberList),
+			domains: areaList[0]
+		}
+	}
+
+
+
+	const route = router.resolve({
+		path: "/dataLibrary/countryBill",
+		query: param
+	});
+	window.open(route.href, "_blank");
+
 
 }
 
@@ -872,10 +903,10 @@ const handleToDataLibrary = (item) => {
 	let congressStr = '全部议院'
 	console.log('item', item);
 	console.log('activeYyList', activeYyList.value);
-	if(activeYyList.value && activeYyList.value.length === 1) {
-		if(activeYyList.value[0] === 'S') {
+	if (activeYyList.value && activeYyList.value.length === 1) {
+		if (activeYyList.value[0] === 'S') {
 			congressStr = '参议院'
-		} else if(activeYyList.value[0] === 'H') {
+		} else if (activeYyList.value[0] === 'H') {
 			congressStr = '众议院'
 		}
 	}
@@ -883,7 +914,7 @@ const handleToDataLibrary = (item) => {
 		selectedOrg: item.name,
 		selectedCongress: congressStr
 	}
-	
+
 	const route = router.resolve({
 		path: "/dataLibrary/countryBill",
 		query: param

src/views/bill/billHome/index.vue

@@ -21,7 +21,7 @@
 					moreText="查看全部委员会"
 					:moreCardMinCount="7"
 					@time-click="handleCommitteeTimeClick"
-					@name-click="handleToDataLibrary"
+					@name-click="handleToInstitution"
 					@count-click="handleToDataLibrary"
 					@more-click="handleToCommitteeMore"
 				/>
@@ -1414,28 +1414,46 @@ const handleResize = () => {
 	box9ChartInstance && box9ChartInstance.resize();
 };
 
-// 下钻至资源库
-const handleToDataLibrary = (item) => {
-
-	window.sessionStorage.setItem("curTabName", item.id);
+// 跳转行政机构主页
+const handleToInstitution = item => {
+	window.sessionStorage.setItem("curTabName", item.orgName);
 	const curRoute = router.resolve({
 		path: "/institution",
 		query: {
-			id: item.id
+			id: item.orgId
 		}
 	});
 	window.open(curRoute.href, "_blank");
+	// router.push({
+	// 	path: "/institution",
+	// 	query: {
+	// 		id: item.orgId
+	// 	}
+	// })
+};
 
-	// console.log('item', item);
-	// const selectParam = {
-	// 	selectedOrg: item.name,
-	// 	selectedCongress: item.chamber
-	// }
-	// const route = router.resolve({
-	// 	path: "/dataLibrary/countryBill",
-	// 	query: selectParam
+// 下钻至资源库
+const handleToDataLibrary = (item) => {
+
+	// window.sessionStorage.setItem("curTabName", item.id);
+	// const curRoute = router.resolve({
+	// 	path: "/institution",
+	// 	query: {
+	// 		id: item.id
+	// 	}
 	// });
-	// window.open(route.href, "_blank");
+	// window.open(curRoute.href, "_blank");
+
+	// console.log('item', item);
+	const selectParam = {
+		selectedOrg: item.name,
+		selectedCongress: item.chamber
+	}
+	const route = router.resolve({
+		path: "/dataLibrary/countryBill",
+		query: selectParam
+	});
+	window.open(route.href, "_blank");
 
 }
 

src/views/comprehensiveSearch/chat/index.vue

 <template>
 	<div class="wrapper">
-		<div class="header">
-			<div class="header-content">
-				<div class="header-item">首页</div>
-				<div class="header-item">></div>
-				<div class="header-item back-item" @click="handleBackHome">综合检索</div>
-				<div class="header-item">></div>
-				<div class="header-item">智能问答</div>
-			</div>
-		</div>
 		<div class="main">
 			<div class="left">
 				<div class="left-header">
@@ -199,12 +190,6 @@ const areaList = ref([
 	}
 ]);
 
-// 返回综合检索
-const handleBackHome = () => {
-	router.push({
-		path: "/comprehensiveSearch"
-	});
-};
 
 const contentContainer = ref(null);
 

src/views/dataLibrary/components/SelectBox/index.vue

@@ -2,7 +2,7 @@
   <div class="select-wrapper" :class="{ 'select-wrapper-custom': selectValue === '自定义' }">
     <div class="select-left text-tip-1">{{ selectTitle + ':' }}</div>
     <div class="select-right" :class="{ 'select-right-custom': selectValue === '自定义' }">
-      <el-select v-model="selectValue" :placeholder="placeholderName" filterable style="width: 240px">
+      <el-select v-model="selectValue" :placeholder="placeholderName" filterable :multiple="isMultiple" style="width: 240px">
         <!-- <el-option label="全部领域" value="全部领域" /> -->
         <el-option v-for="item in selectList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
@@ -37,6 +37,10 @@ const props = defineProps({
   customTime: {
     type: String,
     default: ''
+  },
+  isMultiple: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -58,7 +62,7 @@ const customTimeValue = computed({
 <style lang="scss" scoped>
 .select-wrapper {
   width: 348px;
-  height: 28px;
+  min-height: 28px;
   display: flex;
   justify-content: space-between;
   align-items: center;

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

@@ -721,12 +721,12 @@ const handleSelectEntityType = value => {
 const handleGetEntityTypes = async () => {
   try {
     const res = await getEntityTypes()
-    console.log('获取实体类型列表');
+    console.log('获取实体类型列表', res);
     if (res.code === 200 && res.data) {
       entityTypeList.value = res.data.map(item => {
         return {
           name: item.name,
-          id: item.code
+          id: item.id
         }
       })
     }
@@ -814,7 +814,6 @@ const fetchTableData = async () => {
     provinceName: selectedProvince.value === '全部省份' ? null : selectedProvince.value,  // 实体省份
     entityTypeCode: selectedEntityType.value === '全部实体类型' ? null : selectedEntityType.value,  // 实体类别
     ratio: isHalfRule.value ? 'Y' : null,  // 50%规则
-    isInvolveCn: isCnEntityOnly.value ? 'Y' : null,  // 是否只看中国实体
     sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
   }
   try {
@@ -905,7 +904,6 @@ const fetchAllData = async () => {
     provinceName: selectedProvince.value === '全部省份' ? null : selectedProvince.value,  // 实体省份
     entityTypeCode: selectedEntityType.value === '全部实体类型' ? null : selectedEntityType.value,  // 实体类别
     ratio: isHalfRule.value ? 'Y' : null,  // 50%规则
-    isInvolveCn: isCnEntityOnly.value ? 'Y' : null,  // 是否只看中国实体
     sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
   }
   try {
@@ -1064,11 +1062,16 @@ const initParam = () => {
     }
 
     selectedProvince.value = route.query.selectedProvince ? provinceList.value.filter(item => item.name.indexOf(route.query.selectedProvince) > -1)[0].name : '全部省份'
-    selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
 
-    isHalfRule.value = route.query.isHalfRule ? true : false
+
+    isHalfRule.value = route.query.isHalfRule === 'true' ? true : false
 
     isCnEntityOnly.value = route.query.isCnEntityOnly ? true : false
+    if (isCnEntityOnly.value) {
+      selectedCountry.value = '0101'
+    } else {
+      selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
+    }
 
     selectedEntityType.value = route.query.selectedEntityType ? entityTypeList.value.filter(item => item.name === route.query.selectedEntityType)[0].id : '全部实体类型'
 
@@ -1083,17 +1086,32 @@ const initParam = () => {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)
     }
-    isHalfRule.value = savedQuery.isHalfRule ? true : false
+    isHalfRule.value = savedQuery.isHalfRule === 'true'  ? true : false
     selectedProvince.value = savedQuery.selectedProvince ? provinceList.value.filter(item => item.name.indexOf(savedQuery.selectedProvince) > -1)[0].name : '全部省份'
-    selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
 
     isCnEntityOnly.value = savedQuery.isCnEntityOnly ? true : false
+    if (isCnEntityOnly.value) {
+      selectedCountry.value = '0101'
+    } else {
+      selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
+    }
 
     selectedEntityType.value = savedQuery.selectedEntityType ? entityTypeList.value.filter(item => item.name === savedQuery.selectedEntityType)[0].id : '全部实体类型'
   }
 
 }
 
+watch(
+  () => isCnEntityOnly.value,
+  val => {
+    if (val) {
+      selectedCountry.value = '0101'
+    } else {
+      selectedCountry.value = '全部国家'
+    }
+  }
+)
+
 // 跳转机构详情
 const handleClickToDetail = (curEntity) => {
   console.log('curEntity', curEntity);

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

@@ -180,6 +180,7 @@ import BarChart from '../../components/BarChart/index.vue'
 import RaderChart from '../../components/RadarChart/idnex.vue'
 import SelectBox from '../../components/SelectBox/index.vue'
 import DataChartSwitchBox from '../../components/dataChartSwitchBox/index.vue'
+
 import { useRoute } from "vue-router";
 import router from '@/router'
 
@@ -813,7 +814,7 @@ const fetchTableData = async () => {
     provinceName: selectedProvince.value === '全部省份' ? null : selectedProvince.value,  // 实体省份
     entityTypeCode: selectedEntityType.value === '全部实体类型' ? null : selectedEntityType.value,  // 实体类别
     ratio: isHalfRule.value ? 'Y' : null,  // 50%规则
-    isInvolveCn: isCnEntityOnly.value ? 'Y' : null,  // 是否只看中国实体
+    // isInvolveCn: isCnEntityOnly.value ? 'Y' : null,  // 是否只看中国实体
     sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
   }
   try {
@@ -861,7 +862,17 @@ const fetchTableData = async () => {
 
     setTimeout(() => {
       activeChart.value = curDemensionItem.chartTypeList[0]
-      curChartData.value = curDemensionItem.data
+      if (curDemension.value === '制裁时间') {
+        if (selectedTime.value === '按月度统计') {
+          curChartData.value = curDemensionItem.data
+        } else if (selectedTime.value === '按季度统计') {
+          curChartData.value = curDemensionItem.quatarData
+        } else {
+          curChartData.value = curDemensionItem.yearData
+        }
+      } else {
+        curChartData.value = curDemensionItem.data
+      }
     })
     loading.value = false
   } catch (error) {
@@ -894,7 +905,7 @@ const fetchAllData = async () => {
     provinceName: selectedProvince.value === '全部省份' ? null : selectedProvince.value,  // 实体省份
     entityTypeCode: selectedEntityType.value === '全部实体类型' ? null : selectedEntityType.value,  // 实体类别
     ratio: isHalfRule.value ? 'Y' : null,  // 50%规则
-    isInvolveCn: isCnEntityOnly.value ? 'Y' : null,  // 是否只看中国实体
+    // isInvolveCn: isCnEntityOnly.value ? 'Y' : null,  // 是否只看中国实体
     sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
   }
   try {
@@ -1053,11 +1064,16 @@ const initParam = () => {
     }
 
     selectedProvince.value = route.query.selectedProvince ? provinceList.value.filter(item => item.name.indexOf(route.query.selectedProvince) > -1)[0].name : '全部省份'
-    selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
 
-    isHalfRule.value = route.query.isHalfRule ? true : false
+
+    isHalfRule.value = route.query.isHalfRule === 'true' ? true : false
 
     isCnEntityOnly.value = route.query.isCnEntityOnly ? true : false
+    if (isCnEntityOnly.value) {
+      selectedCountry.value = '0101'
+    } else {
+      selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
+    }
 
     selectedEntityType.value = route.query.selectedEntityType ? entityTypeList.value.filter(item => item.name === route.query.selectedEntityType)[0].id : '全部实体类型'
 
@@ -1072,17 +1088,32 @@ const initParam = () => {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)
     }
-    isHalfRule.value = savedQuery.isHalfRule ? true : false
+    isHalfRule.value = savedQuery.isHalfRule === 'true'  ? true : false
     selectedProvince.value = savedQuery.selectedProvince ? provinceList.value.filter(item => item.name.indexOf(savedQuery.selectedProvince) > -1)[0].name : '全部省份'
-    selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
 
     isCnEntityOnly.value = savedQuery.isCnEntityOnly ? true : false
+    if (isCnEntityOnly.value) {
+      selectedCountry.value = '0101'
+    } else {
+      selectedCountry.value = route.query.selectedCountryId ? route.query.selectedCountryId : '全部国家'
+    }
 
     selectedEntityType.value = savedQuery.selectedEntityType ? entityTypeList.value.filter(item => item.name === savedQuery.selectedEntityType)[0].id : '全部实体类型'
   }
 
 }
 
+watch(
+  () => isCnEntityOnly.value,
+  val => {
+    if (val) {
+      selectedCountry.value = '0101'
+    } else {
+      selectedCountry.value = '全部国家'
+    }
+  }
+)
+
 // 跳转机构详情
 const handleClickToDetail = (curEntity) => {
   console.log('curEntity', curEntity);
@@ -1090,11 +1121,11 @@ const handleClickToDetail = (curEntity) => {
   window.sessionStorage.setItem("decreeId", curEntity.id);
   window.sessionStorage.setItem("curTabName", curEntity.title);
   const route = router.resolve({
-				name: "companyPages",
-				params: {
-					id: curEntity.id
-				}
-			});
+    name: "companyPages",
+    params: {
+      id: curEntity.id
+    }
+  });
   window.open(route.href, "_blank");
 };
 
@@ -1207,9 +1238,17 @@ onMounted(async () => {
   }
 
   .chart-main-box {
+    width: 1568px;
+    height: 809px;
+    margin: 0 auto;
+    background: rgba(255, 255, 255);
+    border: 1px solid var(--bg-black-5);
+    border-radius: 10px;
+
     .info-box {
       margin: 0 auto;
-      width: 1568px;
+      margin-top: 16px;
+      width: 1520px;
       height: 30px;
       display: flex;
       justify-content: space-between;
@@ -1229,14 +1268,13 @@ onMounted(async () => {
     .content-box {
       margin: 0 auto;
       margin-top: 16px;
-      width: 1568px;
-      height: 766px;
-      border-radius: 10px;
-      background: rgba(255, 255, 255);
-      border: 1px solid var(--bg-black-5);
+      width: 1520px;
+      height: 726px;
+      border: none;
+
 
       .content-header {
-        margin: 16px 24px;
+        margin: 16px 0;
         width: 1520px;
         height: 28px;
       }

src/views/dataLibrary/technologyFigures/index.vue

@@ -1213,4 +1213,6 @@ onMounted(async () => {
 // :deep(.el-table__header th:first-child) {
 //   background-color: #e6f7ff;
 //   color: #1890ff;
-// }</style>
\ No newline at end of file
+// }
+</style>
+

src/views/exportControl/components/info.vue

@@ -7,7 +7,7 @@
 				<div class="sub-title">{{ subtitle }}</div>
 			</div>
 			<div class="description">{{ description }}</div>
-			<div v-if="quantity > 0" class="quantity" :style="{ color: color }">
+			<div v-if="quantity > 0" class="quantity" :style="{ color: color }" @click.stop="handleClickNum(title)">
 				{{ quantity }}{{ unit || "个" }}
 				<div class="quantity-title-des" v-if="desMap[title]">
 					<img class="info-icon" :src="infoIcon" alt="" />
@@ -20,6 +20,28 @@
 
 <script setup>
 import infoIcon from "../assets/icons/info-icon.png";
+import { useRouter } from "vue-router";
+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");
+	} else if (item === '商业管制清单') {
+		const route = router.resolve({
+			path: "/dataLibrary/dataCommerceControlList",
+		});
+		window.open(route.href, "_blank");
+	}
+}
+
+
 defineProps({
 	title: {
 		type: String,
@@ -135,6 +157,7 @@ const desMap = {
 	display: flex;
 	flex-direction: column;
 	align-items: flex-end;
+
 	.quantity-title-des {
 		display: flex;
 		align-items: center;
@@ -143,6 +166,7 @@ const desMap = {
 		font-weight: 400;
 		color: rgba(95, 101, 108, 1);
 		line-height: 1.4;
+
 		.info-icon {
 			width: 16px;
 			height: 16px;

src/views/exportControl/index.vue

@@ -116,7 +116,7 @@
 													</div>
 												</div>
 											</div>
-											<div class="box1-absolute">
+											<div class="box1-absolute" @click="handleToDataLibrary(item)">
 												<div class="box1-absolute-des">
 													<el-icon>
 														<Warning color="rgba(206, 79, 81, 1)" />
@@ -867,7 +867,8 @@ const handleTitleClick = item => {
 		path: "/exportControl/singleSanction",
 		query: {
 			id: item.id,
-			sanTypeId: item.sanTypeId
+			sanTypeId: item.sanTypeId,
+			date: `${item.year}-${item.dateStr}`
 		}
 	});
 	window.open(route.href, "_blank");
@@ -1765,7 +1766,8 @@ const handleSanc = item => {
 		path: "/exportControl/singleSanction",
 		query: {
 			id: item.id,
-			sanTypeId: activeResourceTabItem.value.id
+			sanTypeId: activeResourceTabItem.value.id,
+			date: item.postDate
 		}
 	});
 	window.open(route.href, "_blank");
@@ -1821,7 +1823,7 @@ const handleSearch = () => {
 const handleEntityRowClick = row => {
 	console.log("row", row);
 	const params = {
-		domains: row.tags[0],
+		// domains: row.tags[0],
 		selectedDate: JSON.stringify([row.year + "-01-01", row.year + "-12-31"])
 	};
 	const route = router.resolve({
@@ -1835,7 +1837,7 @@ const handleEntityRowClick = row => {
 const handleCommercialRowClick = row => {
 	console.log("row", row);
 	const params = {
-		domains: row.tags[0],
+		// domains: row.tags[0],
 		selectedDate: JSON.stringify([row.year + "-01-01", row.year + "-12-31"])
 	};
 	const route = router.resolve({
@@ -1861,18 +1863,31 @@ const handleRadarChartClick = value => {
 
 // 点击制裁清单数量增长趋势
 const handleMultiBarChartClick = val => {
-	// console.log('value', val);
 	const params = {
+		isHalfRule: trendChecked.value,
 		domains: val.seriesName,
+		isCnEntityOnly: true,
 		selectedDate: JSON.stringify([val.name + "-01-01", val.name + "-12-31"])
 	};
 	const route = router.resolve({
-		path: "/dataLibrary/dataEntityListEvent",
+		path: selectedEntityId.value === 1 ? "/dataLibrary/dataEntityList" : "/dataLibrary/dataCommerceControlList",
 		query: params
 	});
 	window.open(route.href, "_blank");
 };
 
+// 跳转到数据资源库
+const handleToDataLibrary = (item) => {
+			const route = router.resolve({
+			path: "/dataLibrary/dataEntityList",
+			query: {
+				isCnEntityOnly: true,
+				selectedDate: JSON.stringify([item.postDate, item.postDate])
+			}
+		});
+		window.open(route.href, "_blank");
+}
+
 onMounted(async () => {
 	handleGetHylyList();
 	let chart1 = getMultiLineChart(chart1Data.value.title, chart1Data.value.data[0].value, chart1Data.value.data[1].value);
@@ -1986,7 +2001,7 @@ const handleMediaClick = item => {
 		padding-right: 50px;
 		box-sizing: border-box;
 		background: linear-gradient(to right, rgba(206, 79, 81, 0), rgba(206, 79, 81, 0.3));
-
+		cursor: pointer;
 		&-des {
 			display: flex;
 			gap: 5px;

src/views/exportControl/v2.0EntityList/components/dataStatistics/index.vue

 <template>
 	<div class="data-statistics">
 		<div class="nav">
-			<div class="nav-item">
+			<div class="nav-item" @click="handleToDataLibrary">
 				<div class="item-position"></div>
 				<div class="content">
 					<div class="info">
@@ -13,7 +13,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="nav-item">
+			<div class="nav-item" @click="handleToDataLibrary1">
 				<div class="item-position"></div>
 				<div class="content">
 					<div class="info">
@@ -26,7 +26,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="nav-item">
+			<div class="nav-item" @click="handleToDataLibrary2">
 				<div class="item-position"></div>
 				<div class="content">
 					<div class="info">
@@ -38,7 +38,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="nav-item">
+			<div class="nav-item" @click="handleToDataLibrary3(totalCount.latestTime)">
 				<div class="item-position"></div>
 				<div class="content">
 					<div class="info">
@@ -412,6 +412,8 @@ const totalCount = ref(0);
 const getTotalCountData = async () => {
 	try {
 		const res = await getTotalCount(sanTypeId.value);
+		console.log('统计', res);
+		
 		totalCount.value = res.data || 0;
 	} catch (error) {
 		console.error("获取实体清单-数据统计-总量统计失败:", error);
@@ -1193,7 +1195,49 @@ const handlePieChartClick1 = val => {
 		query: params
 	});
 	window.open(route.href, "_blank");
-};
+}
+
+// 跳转到数据资源库
+const handleToDataLibrary = () => {
+	const route = router.resolve({
+		path: "/dataLibrary/dataEntityList",
+		query:{
+			isCnEntityOnly: true
+		}
+	});
+	window.open(route.href, "_blank");
+}
+
+const handleToDataLibrary1 = () => {
+	const route = router.resolve({
+		path: "/dataLibrary/dataEntityList",
+		query:{
+			isCnEntityOnly: true,
+			isHalfRule: true
+		}
+	});
+	window.open(route.href, "_blank");
+}
+
+const handleToDataLibrary2 = () => {
+	const route = router.resolve({
+		path: "/dataLibrary/dataEntityList",
+		query:{
+			selectedDate: JSON.stringify([currentYear+'01-01', currentYear+ '12-31'])
+		}
+	});
+	window.open(route.href, "_blank");
+}
+
+const handleToDataLibrary3 = (time) => {
+	const route = router.resolve({
+		path: "/dataLibrary/dataEntityList",
+		query:{
+			selectedDate: JSON.stringify([time, time])
+		}
+	});
+	window.open(route.href, "_blank");
+}
 
 onMounted(() => {
 	sanTypeId.value = route.query.sanTypeId || "";
@@ -1235,6 +1279,10 @@ onMounted(() => {
 			background-color: #fff;
 			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 			position: relative;
+			cursor: pointer;
+			&:hover{
+				background: var(--color-primary-2);
+			}
 
 			.item-position {
 				position: absolute;

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

@@ -75,17 +75,9 @@
 				<AnalysisBox title="实体清单更新历史" :showAllBtn="false">
 					<template #header-btn>
 						<div class="filters">
-							<el-select
-								v-model="selectedDomain"
-								placeholder="Select"
-								style="width: 150px; height: 32px; margin-right: 16px"
-							>
-								<el-option
-									v-for="item in domainOptions"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"
-								/>
+							<el-select v-model="selectedDomain" placeholder="Select"
+								style="width: 150px; height: 32px; margin-right: 16px">
+								<el-option v-for="item in domainOptions" :key="item.value" :label="item.label" :value="item.value" />
 							</el-select>
 							<el-checkbox v-model="onlyChina">只看涉华动态</el-checkbox>
 						</div>
@@ -99,20 +91,15 @@
 							<img :src="item.icon || title" alt="" />
 							<div class="main">
 								<div class="main-title" @click="handleClick(item)">{{ item.name }}</div>
-								<el-tooltip
-									effect="dark"
-									:content="item.summary"
-									popper-class="common-prompt-popper"
-									placement="top"
-									:show-after="500"
-								>
+								<el-tooltip effect="dark" :content="item.summary" popper-class="common-prompt-popper" placement="top"
+									:show-after="500">
 									<div class="main-desc">{{ item.summary }}</div>
 								</el-tooltip>
 								<div class="tag-box">
 									<div v-for="tag in item.techDomainList" :key="tag" class="tag-item">{{ tag }}</div>
 								</div>
 
-								<div :class="{ 'count-tag': item.cnEntityCount }">
+								<div :class="{ 'count-tag': item.cnEntityCount }" @click="handleToDataLibrary">
 									{{ item.cnEntityCount ? `${item.cnEntityCount}家中国实体` : "" }}
 								</div>
 							</div>
@@ -120,14 +107,8 @@
 					</div>
 					<div class="left-footer">
 						<div class="total-count">共 {{ totalAll }} 项</div>
-						<el-pagination
-							v-model:current-page="currentPageAll"
-							:page-size="pageSizeAll"
-							:total="totalAll"
-							layout="prev, pager, next"
-							background
-							@current-change="handlePageChangeAll"
-						/>
+						<el-pagination v-model:current-page="currentPageAll" :page-size="pageSizeAll" :total="totalAll"
+							layout="prev, pager, next" background @current-change="handlePageChangeAll" />
 					</div>
 				</AnalysisBox>
 			</div>
@@ -149,12 +130,8 @@
 							<span>关键人物</span>
 						</div>
 						<div class="key-person-list">
-							<div
-								class="person-item"
-								v-for="(item, index) in publishInfo.personList"
-								:key="index"
-								@click="handlePerClick(item)"
-							>
+							<div class="person-item" v-for="(item, index) in publishInfo.personList" :key="index"
+								@click="handlePerClick(item)">
 								<img :src="item.imageUrl" alt="" />
 								<div class="person-info">
 									<CommonPrompt :content="item.name">
@@ -242,7 +219,8 @@ const handleClick = item => {
 		path: "/exportControl/singleSanction",
 		query: {
 			id: item.id,
-			sanTypeId: item.sanTypeId || 1
+			sanTypeId: item.sanTypeId || 1,
+			date: `${item.year}-${item.date}`
 		}
 	});
 	window.open(route.href, "_blank");
@@ -421,6 +399,30 @@ const getEntityInfoFn = async id => {
 };
 
 const sanTypeId = ref("");
+
+// 跳转到数据资源库
+const handleToDataLibrary = () => {
+
+	let domainStr = domainOptions.filter(item => item.value === selectedDomain.value)[0].label
+	let params
+	if (domainStr === '全部领域') {
+		params = {
+			isCnEntityOnly: true,
+		}
+	} else {
+		params = {
+			isCnEntityOnly: true,
+			domains: domainStr
+		};
+	}
+	const route = router.resolve({
+		path: "/dataLibrary/dataEntityList",
+		query: params
+	});
+	window.open(route.href, "_blank");
+}
+
+
 onMounted(() => {
 	sanTypeId.value = route.query.sanTypeId;
 	// 获取实体清单基本信息

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

 <template>
 	<div class="data-statistics">
 		<div class="nav">
-			<div class="nav-item">
+			<div class="nav-item" @click="handleToDataLibrary">
 				<div class="item-position"></div>
 				<div class="content">
 					<div class="info">
@@ -13,7 +13,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="nav-item">
+			<div class="nav-item" @click="handleToDataLibrary1">
 				<div class="item-position"></div>
 				<div class="content">
 					<div class="info">
@@ -26,7 +26,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="nav-item">
+			<div class="nav-item"  @click="handleToDataLibrary2">
 				<div class="item-position"></div>
 				<div class="content">
 					<div class="info">
@@ -351,6 +351,8 @@ const getTotalCount = async () => {
 	if (!sanRecordId.value) return;
 	try {
 		const res = await getSingleSanctionTotalCount(route.query.sanTypeId, sanRecordId.value);
+		console.log('统计', res);
+
 		if (res.code === 200) {
 			totalCount.value = res.data || {};
 		}
@@ -882,7 +884,6 @@ const handlePieChartClick1 = (val) => {
 
 // 制裁实体国家地区分布情况
 const handleClickRankChart = (item) => {
-	// console.log('item', item);
 	const params = {
 		selectedCountryId: item.id,
 		selectedDate: JSON.stringify([route.query.date, route.query.date])
@@ -908,6 +909,43 @@ const handleRankChartClick = (item) => {
 	window.open(curRoute.href, "_blank");
 }
 
+// 跳转到数据资源库
+const handleToDataLibrary = () => {
+	const dateStr = route.query.date ? route.query.date : ''
+	const curRoute = router.resolve({
+		path: "/dataLibrary/dataEntityList",
+		query: {
+			isCnEntityOnly: true,
+			selectedDate: JSON.stringify([dateStr, dateStr])
+		}
+	});
+	window.open(curRoute.href, "_blank");
+}
+
+const handleToDataLibrary1 = () => {
+	const dateStr = route.query.date ? route.query.date : ''
+	const curRoute = router.resolve({
+		path: "/dataLibrary/dataEntityList",
+		query: {
+			isCnEntityOnly: true,
+			isHalfRule: true,
+			selectedDate: JSON.stringify([dateStr, dateStr])
+		}
+	});
+	window.open(curRoute.href, "_blank");
+}
+
+const handleToDataLibrary2 = () => {
+	const dateStr = route.query.date ? route.query.date : ''
+	const curRoute = router.resolve({
+		path: "/dataLibrary/dataEntityList",
+		query: {
+			selectedDate: JSON.stringify([dateStr, dateStr])
+		}
+	});
+	window.open(curRoute.href, "_blank");
+}
+
 
 onMounted(() => {
 	// 获取路由参数id
@@ -957,6 +995,11 @@ onMounted(() => {
 			background-color: #fff;
 			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 			position: relative;
+			cursor: pointer;
+
+			&:hover {
+				background: var(--color-primary-2);
+			}
 
 			.item-position {
 				position: absolute;

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

@@ -45,17 +45,15 @@
 						<div class="left-top-content">
 							<div class="content-title">制裁实体分布：</div>
 							<div class="distribution-list">
-								<div class="list-item" v-for="(item, index) in entityDistribution" :key="index">
+								<div class="list-item" v-for="(item, index) in entityDistribution" :key="index"
+									@click="handleToDataLibrary(item)">
 									<img :src="item.imageUrl || flag" alt="" class="flag" />
 									<div class="country-name">{{ item.name }}</div>
 									<div class="progress-bar-container">
-										<div
-											class="progress-bar"
-											:style="{
-												width: item.width,
-												background: item.gradient
-											}"
-										></div>
+										<div class="progress-bar" :style="{
+											width: item.width,
+											background: item.gradient
+										}"></div>
 									</div>
 									<div class="count" :class="{ highlight: index === 0 }">{{ item.count }}家</div>
 								</div>
@@ -98,25 +96,13 @@
 							</div>
 							<div class="filter-right">
 								<el-checkbox v-model="onlyChina" label="只看中国实体" />
-								<el-select
-									v-model="filterField"
-									placeholder="选择领域"
-									style="width: 150px; margin: 0 12px 0 16px"
-								>
+								<el-select v-model="filterField" placeholder="选择领域" style="width: 150px; margin: 0 12px 0 16px">
 									<!-- <el-option label="全部领域" value="" /> -->
-									<el-option
-										v-for="item in domainOptions"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-									/>
+									<el-option v-for="item in domainOptions" :key="item.value" :label="item.label" :value="item.value" />
 								</el-select>
-								<el-input
-									v-model="searchKeyword"
-									placeholder="搜索实体"
+								<el-input v-model="searchKeyword" placeholder="搜索实体"
 									style="width: 150px; border: 1px solid rgba(170, 173, 177, 0.4); border-radius: 5px"
-									:suffix-icon="Search"
-								/>
+									:suffix-icon="Search" />
 							</div>
 						</div>
 						<div class="stats-row">
@@ -131,21 +117,14 @@
 							<div class="stats-info">
 								<div class="stat-item">
 									<span class="dot red"></span>
-									<span class="text"
-										>新增 <span class="num red">{{ addCount }}</span> 家 (50%规则涉及<span class="num red">{{
-											addRuleCount
-										}}</span
-										>家)</span
-									>
+									<span class="text">新增 <span class="num red">{{ addCount }}</span> 家 (50%规则涉及<span class="num red">{{
+										addRuleCount
+									}}</span>家)</span>
 								</div>
 								<div class="stat-item">
 									<span class="dot green"></span>
-									<span class="text"
-										>移除 <span class="num green">{{ removeCount }}</span> 家 (50%规则涉及<span
-											class="num green"
-											>{{ removeRuleCount }}</span
-										>家)</span
-									>
+									<span class="text">移除 <span class="num green">{{ removeCount }}</span> 家 (50%规则涉及<span
+											class="num green">{{ removeRuleCount }}</span>家)</span>
 								</div>
 							</div>
 						</div>
@@ -177,11 +156,7 @@
 												>{{ item }}</span
 											> -->
 											<div class="domain-box">
-												<AreaTag
-													v-for="(domain, index) in scope.row.fields"
-													:key="index"
-													:tagName="domain"
-												/>
+												<AreaTag v-for="(domain, index) in scope.row.fields" :key="index" :tagName="domain" />
 											</div>
 										</template>
 									</el-table-column>
@@ -190,11 +165,8 @@
 									<el-table-column prop="revenue" label="营收(亿元)" width="110" align="center" />
 									<el-table-column label="50%规则子企业" width="180" align="center">
 										<template #default="scope">
-											<span
-												v-if="scope.row.subsidiaryCount"
-												class="subsidiary-link"
-												@click="handleSubsidiaryClick(scope.row)"
-											>
+											<span v-if="scope.row.subsidiaryCount" class="subsidiary-link"
+												@click="handleSubsidiaryClick(scope.row)">
 												{{ scope.row.subsidiaryText }}
 												<span class="blue-text">{{ scope.row.subsidiaryCount }}家 ></span>
 											</span>
@@ -212,12 +184,8 @@
 			</div>
 		</div>
 		<!-- 50%规则子企业弹框 -->
-		<RuleSubsidiaryDialog
-			v-model="subsidiaryDialogVisible"
-			:company-name="currentSubsidiaryCompanyName"
-			:total-count="currentSubsidiaryCount"
-			:data-list="currentSubsidiaryList"
-		/>
+		<RuleSubsidiaryDialog v-model="subsidiaryDialogVisible" :company-name="currentSubsidiaryCompanyName"
+			:total-count="currentSubsidiaryCount" :data-list="currentSubsidiaryList" />
 	</div>
 </template>
 
@@ -342,8 +310,8 @@ const getSanctionOverviewList = async () => {
 					subsidiaryText:
 						org.ruleOrgList && org.ruleOrgList.length > 0
 							? (org.ruleOrgList[0].orgName.length > 10
-									? org.ruleOrgList[0].orgName.slice(0, 10) + "..."
-									: org.ruleOrgList[0].orgName) + "...等"
+								? org.ruleOrgList[0].orgName.slice(0, 10) + "..."
+								: org.ruleOrgList[0].orgName) + "...等"
 							: ""
 				}))
 			}));
@@ -555,6 +523,26 @@ const entityDistribution = ref([
 	}
 ]);
 const sanTypeId = ref("");
+
+// 跳转到数据资源库
+const handleToDataLibrary = (item) => {
+	console.log('item', item);
+	const dateStr = formattedData.value.postDate.replace(/(\d{4})年(\d{1,2})月(\d{1,2})日/, (_, 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]),
+			selectedCountryId: item.id
+		}
+	});
+	window.open(route.href, "_blank");
+
+
+}
+
 onMounted(() => {
 	// 获取路由参数中的sanTypeId
 	console.log("route.query.sanTypeId --:", route.query.sanTypeId);
@@ -696,6 +684,11 @@ onMounted(() => {
 							display: flex;
 							align-items: center;
 							height: 24px;
+							cursor: pointer;
+
+							&:hover {
+								background: var(--color-primary-2);
+							}
 
 							.flag {
 								width: 24px;

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

@@ -247,12 +247,15 @@ const handlePageChange = async newPage => {
 
 // ========== 选择某项 ==========
 const selectSanction = async item => {
+	// console.log('item', item);
+	
 	selectedSanctionId.value = item.id;
 	router.replace({
 		path: window.location.pathname,
 		query: {
 			id: item.id,
-			sanTypeId: item.sanTypeId
+			sanTypeId: item.sanTypeId,
+			date: item.postDate
 		}
 	});
 	sanctionModalVisible.value = false;
@@ -260,7 +263,7 @@ const selectSanction = async item => {
 	// 根据最新URL参数刷新当前页面
 	window.sessionStorage.setItem("curTabName", item.postDate + " 《实体清单新增条目》");
 
-	window.open(`${window.location.pathname}?id=${item.id}&sanTypeId=${item.sanTypeId}`, "_self");
+	window.open(`${window.location.pathname}?id=${item.id}&sanTypeId=${item.sanTypeId}&date=${item.postDate}`, "_self");
 };
 
 // ========== 关闭弹窗时重置 ==========

src/views/finance/components/info.vue

@@ -7,7 +7,7 @@
 				<div class="sub-title">{{ subtitle }}</div>
 			</div>
 			<div class="description">{{ description }}</div>
-			<div v-if="quantity > 0" class="quantity" :style="{ color: color }">
+			<div v-if="quantity > 0" class="quantity" :style="{ color: color }" @click.stop="handleClickNum(title)">
 				{{ quantity }}{{ unit || "个" }}
 				<div class="quantity-title-des" v-if="desMap[title]">
 					<img class="info-icon" :src="infoIcon" alt="" />
@@ -20,6 +20,25 @@
 
 <script setup>
 import infoIcon from "../assets/icons/info-icon.png";
+import { useRouter } from "vue-router";
+const router = useRouter()
+
+const handleClickNum = (item) => {
+	if (item === '特别指定国民清单') {
+		const route = router.resolve({
+			path: "/dataLibrary/sDNList",
+			// query: {
+			// 	isCnEntityOnly: true
+			// }
+		});
+		window.open(route.href, "_blank");
+	} else if (item === '涉军企业清单') {
+		const route = router.resolve({
+			path: "/dataLibrary/mREList",
+		});
+		window.open(route.href, "_blank");
+	}
+}
 defineProps({
 	title: {
 		type: String,

src/views/finance/index.vue

@@ -84,7 +84,7 @@
 													</div>
 												</div>
 											</div>
-											<div class="box1-absolute">
+											<div class="box1-absolute" @click="handleToDataLibrary(item)">
 												<div class="box1-absolute-des">
 													<el-icon>
 														<Warning color="rgba(206, 79, 81, 1)" />
@@ -149,7 +149,7 @@
 							<div class="box3">
 								<div class="box3-content">
 									<div class="box3-content-title">特别指定国民清单(SDN)发布频度</div>
-									<el-table :data="entityListReleaseFreq" stripe style="width: 100%">
+									<el-table :data="entityListReleaseFreq" stripe style="width: 100%" @row-click="handleEntityRowClick">
 										<el-table-column prop="year" label="年份" width="200" />
 										<el-table-column label="发布次数" width="300">
 											<template #default="scope">
@@ -186,7 +186,7 @@
 								</div>
 								<div class="box3-content">
 									<div class="box3-content-title">中国军事工业复合体企业清单(CMIC)更新频度</div>
-									<el-table :data="commerceControlListReleaseFreq" stripe style="width: 100%; margin-bottom: auto">
+									<el-table :data="commerceControlListReleaseFreq" stripe style="width: 100%; margin-bottom: auto" @row-click="handleCommercialRowClick">
 										<el-table-column prop="year" label="年份" width="200" />
 										<el-table-column label="发布次数" width="300">
 											<template #default="scope">
@@ -257,7 +257,8 @@
 							<el-checkbox v-model="domainChecked" label="50%规则" size="large" />
 						</template>
 						<template #default>
-							<EChart :option="radarOption" autoresize :style="{ height: '420px' }" />
+							<EChart :option="radarOption" autoresize :style="{ height: '420px' }"
+								@chart-click="handleRadarChartClick" />
 							<div class="data-origin-box">
 								<div class="data-origin-icon">
 									<img :src="tipsIcon" alt="" />
@@ -284,7 +285,8 @@
 							</div>
 						</template>
 						<template #default>
-							<EChart :option="trendOption" autoresize :style="{ height: '420px' }" />
+							<EChart :option="trendOption" autoresize :style="{ height: '420px' }"
+								@chart-click="handleMultiBarChartClick" />
 							<div class="data-origin-box">
 								<div class="data-origin-icon">
 									<img :src="tipsIcon" alt="" />
@@ -1593,6 +1595,80 @@ const handleSearch = () => {
 	window.open(curRoute.href, "_blank");
 };
 
+// 点击特别指定国民清单(SDN)发布频度
+const handleEntityRowClick = row => {
+	// console.log("row", row);
+	const params = {
+		// domains: row.tags[0],
+		selectedDate: JSON.stringify([row.year + "-01-01", row.year + "-12-31"])
+	};
+	const route = router.resolve({
+		path: "/dataLibrary/sDNListEvent",
+		query: params
+	});
+	window.open(route.href, "_blank");
+};
+
+// 点击中国军事工业复合体企业清单(CMIC)更新频度
+const handleCommercialRowClick = row => {
+	console.log("row", row);
+	const params = {
+		selectedDate: JSON.stringify([row.year + "-01-01", row.year + "-12-31"])
+	};
+	const route = router.resolve({
+		path: "/dataLibrary/mREListEvent",
+		query: params
+	});
+	window.open(route.href, "_blank");
+};
+
+// 点击制裁领域分布
+const handleRadarChartClick = value => {
+	const params = {
+		isHalfRule: domainChecked.value
+	};
+	let route
+	if (domainChecked.value) {
+		route = router.resolve({
+			path: "/dataLibrary/sDNList",
+			query: params
+		});
+	} else {
+		route = router.resolve({
+			path: "/dataLibrary/sDNList",
+		});
+	}
+
+	window.open(route.href, "_blank");
+};
+
+// 点击制裁清单数量增长趋势
+const handleMultiBarChartClick = val => {
+	const params = {
+		isHalfRule: trendChecked.value,
+		domains: val.seriesName,
+		isCnEntityOnly: true,
+		selectedDate: JSON.stringify([val.name + "-01-01", val.name + "-12-31"])
+	};
+	const route = router.resolve({
+		path: selectedEntityId.value === 2 ? "/dataLibrary/sDNList" : "/dataLibrary/mREList",
+		query: params
+	});
+	window.open(route.href, "_blank");
+};
+
+// 跳转到数据资源库
+const handleToDataLibrary = (item) => {
+	const route = router.resolve({
+		path: "/dataLibrary/sDNList",
+		query: {
+			isCnEntityOnly: true,
+			selectedDate: JSON.stringify([item.postDate, item.postDate])
+		}
+	});
+	window.open(route.href, "_blank");
+}
+
 onMounted(async () => {
 	console.log("finance 页面 mounted");
 	try {

src/views/finance/utils/charts.js

@@ -973,7 +973,7 @@ export const getMultipleBarChart_m = object => {
 
 	const option = {
 		tooltip: {
-			trigger: "axis",
+			trigger: "item",
 			axisPointer: {
 				type: "shadow"
 			}