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

src/views/exportControl/index.vue

@@ -733,7 +733,7 @@ import setChart from "@/utils/setChart";
 import { ElMessage, ElMessageBox } from "element-plus";
 import listPage from "./v2.0CommercialControlList/components/sanctionsOverview/components/listPage/index.vue";
 
-import { DArrowRight, Warning, Search } from "@element-plus/icons-vue";
+import { DArrowRight, Warning, Search, Message } from "@element-plus/icons-vue";
 import EChart from "@/components/Chart/index.vue";
 import tipsIcon from "./assets/icons/info-icon.png";
 import AiButton from "@/components/base/Ai/AiButton/index.vue";
@@ -883,7 +883,10 @@ const checkedTime = ref(["全部时间"]);
 
 // 跳转到单条制裁页面，单独打开一个新页面
 const handleTitleClick = item => {
-	if (!item.summary) return;
+	if (!item.summary) {
+		ElMessage.warning("当前功能正在开发中，敬请期待");
+		return;
+	}
 	window.sessionStorage.setItem("curTabName", `${item.year}-${item.dateStr}《${item.title}》`);
 	const route = router.resolve({
 		path: "/exportControl/singleSanction",
@@ -1881,7 +1884,7 @@ const handleMultiBarChartClick = val => {
 };
 
 // 跳转到数据资源库
-const handleToDataLibrary = (item) => {
+const handleToDataLibrary = item => {
 	const route = router.resolve({
 		path: "/dataLibrary/dataEntityList",
 		query: {
@@ -1890,7 +1893,7 @@ const handleToDataLibrary = (item) => {
 		}
 	});
 	window.open(route.href, "_blank");
-}
+};
 
 onMounted(async () => {
 	handleGetHylyList();

src/views/finance/index.vue

@@ -60,7 +60,9 @@
 										<div>
 											<div class="box1-top">
 												<div class="box1-top-title">
-													{{ item.postDate }}——BIS《实体清单增列与修订条目》
+													{{ item.postDate }}——{{
+														item.sanTypeId == allSanTypeIds[0] ? "OFAC" : "DoD"
+													}}《实体清单增列与修订条目》
 												</div>
 												<div class="box1-top-content">
 													<div class="box1-top-content-item">
@@ -1085,6 +1087,15 @@ const handleToEntityList = item => {
 
 // 跳转到V2.0实体清单无ID
 const handleToEntityListNoId = item => {
+	const routeData = router.resolve({
+		path: "/finance/sdnlistoverview",
+		query: {
+			sanTypeId: item.id
+		}
+	});
+	// 打开一个新页面
+	window.open(routeData.href, "_blank");
+	return;
 	if (item.id == allSanTypeIds.value[0]) {
 		const routeData = router.resolve({
 			path: "/finance/sdnlistoverview",