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

src/router/modules/finance.js

@@ -16,7 +16,7 @@ const financeRoutes = [
 	{
 		path: "/finance/sdnlistoverview",
 		name: "sdnlistOverview",
-		component: () => import("@/views/finance/v2.0EntityList/index.vue"),
+		component: () => import("@/views/finance/entityList/index.vue"),
 		meta: {
 			title: "SDN制裁清单概览"
 		}
@@ -24,8 +24,8 @@ const financeRoutes = [
 	// V2.0单条制裁详情
 	{
 		path: "/finance/singleSanction",
-		name: "singleSanction",
-		component: () => import("@/views/finance/v2.0SingleSanction/index.vue"),
+		name: "sdnSingleSanction",
+		component: () => import("@/views/finance/singleSanction/index.vue"),
 		meta: {
 			title: "单条制裁详情",
 			dynamicTitle: true
@@ -34,8 +34,8 @@ const financeRoutes = [
 	// V2.0单条制裁详情-实体清单原文
 	{
 		path: "/exportControl/origin",
-		name: "entityListOrigin",
-		component: () => import("@/views/exportControl/v2.0SingleSanction/originPage/index.vue")
+		name: "financeEntityListOrigin",
+		component: () => import("@/views/finance/singleSanction/originPage/index.vue")
 		// meta: {
 		//   title: "实体清单原文"
 		// }
@@ -44,7 +44,7 @@ const financeRoutes = [
 	{
 		path: "/finance/cmccontrolList",
 		name: "cmccontrolList",
-		component: () => import("@/views/finance/v2.0CommercialControlList/index.vue"),
+		component: () => import("@/views/finance/commercialControlList/index.vue"),
 		meta: {
 			title: "涉军企业清单概览"
 		}

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

@@ -271,14 +271,6 @@ onMounted(() => {
 	getUrlParams();
 	getSingleSanctionOverviewData();
 });
-
-// 新增 onActivated，用于从缓存恢复时触发
-onActivated(() => {
-	console.log("出口管制-单次制裁 (从缓存激活)");
-	// 重新获取 URL 参数和数据
-	getUrlParams();
-	getSingleSanctionOverviewData();
-});
 </script>
 
 <style scoped lang="scss">

src/views/finance/v2.0CommercialControlList/components/sanctionsOverview/components/introductionPage/index.vue → src/views/finance/commercialControlList/components/sanctionsOverview/components/introductionPage/index.vue

@@ -25,8 +25,12 @@
 			<div class="left-center">
 				<AnalysisBox title="出口管制分类编码（ECCN）" :showAllBtn="false">
 					<div class="button-list">
-						<div :class="['button', { click: item.isClick }]" @click="changeECCN(item)" v-for="(item, i) in ECCNList"
-							:key="i">
+						<div
+							:class="['button', { click: item.isClick }]"
+							@click="changeECCN(item)"
+							v-for="(item, i) in ECCNList"
+							:key="i"
+						>
 							<span>第{{ item.ranking }}位 {{ item.name }}</span>
 						</div>
 					</div>
@@ -44,9 +48,17 @@
 				<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>
@@ -59,15 +71,21 @@
 							</div>
 							<div class="img-zone">
 								<img :src="item.icon || title" alt />
-								<div v-if="i < sanctionList.length - 1"
-									:class="['img-line', { 'img-line-last': i === sanctionList.length - 1 }]">
-								</div>
+								<div
+									v-if="i < sanctionList.length - 1"
+									:class="['img-line', { 'img-line-last': i === sanctionList.length - 1 }]"
+								></div>
 							</div>
 							<div class="main">
 								<div class="main-title">{{ item.name }}</div>
 								<!-- <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">
@@ -82,8 +100,14 @@
 					</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>
@@ -111,17 +135,31 @@
 							<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">
-									<el-tooltip effect="dark" :content="item.name" popper-class="common-prompt-popper" placement="top"
-										:show-after="500">
+									<el-tooltip
+										effect="dark"
+										:content="item.name"
+										popper-class="common-prompt-popper"
+										placement="top"
+										:show-after="500"
+									>
 										<div class="name">{{ item.name }}</div>
 									</el-tooltip>
-									<el-tooltip effect="dark" :content="item.position" popper-class="common-prompt-popper" placement="top"
-										:show-after="500">
+									<el-tooltip
+										effect="dark"
+										:content="item.position"
+										popper-class="common-prompt-popper"
+										placement="top"
+										:show-after="500"
+									>
 										<div class="title1">{{ item.position }}</div>
 									</el-tooltip>
 								</div>
@@ -189,7 +227,6 @@ const handleClickOrg = item => {
 		}
 	});
 	window.open(route.href, "_blank");
-	
 };
 
 // 处理点击关键人物的方法
@@ -209,13 +246,12 @@ const handlePerClick = item => {
 const handleClick = item => {
 	console.log("点击了实体名称:", item);
 	const route = router.resolve({
-		path: "/exportControl/singleSanction",
+		path: "/finance/singleSanction",
 		query: {
 			id: item.id
 		}
 	});
 	window.open(route.href, "_blank");
-
 };
 
 const selectedDomain = ref(0);

src/views/finance/v2.0EntityList/components/sanctionsOverview/components/introductionPage/index.vue → src/views/finance/entityList/components/sanctionsOverview/components/introductionPage/index.vue

@@ -239,7 +239,7 @@ const handleClick = item => {
 	// console.log("点击了实体名称:", item);
 	window.sessionStorage.setItem("curTabName", `${item.year}-${item.date}《${item.name}》`);
 	const route = router.resolve({
-		path: "/exportControl/singleSanction",
+		path: "/finance/singleSanction",
 		query: {
 			id: item.id,
 			sanTypeId: item.sanTypeId || 1

src/views/finance/index.vue

@@ -105,13 +105,13 @@
 														></el-image>
 														<div v-else class="box1-bottom-content-item-imgUndefined">
 															{{
-																(ett.entityNameZh || ett.enName)?.match(
+																(ett.orgName || ett.orgNameZh)?.match(
 																	/[\u4e00-\u9fa5a-zA-Z0-9]/
 																)?.[0]
 															}}
 														</div>
 														<div class="box1-bottom-content-item-txt">
-															{{ ett.name || ett.entityNameZh }}
+															{{ ett.orgName || ett.orgNameZh }}
 														</div>
 													</div>
 												</div>
@@ -779,7 +779,7 @@ const handleToPosi = id => {
 const handleToRiskSignalDetail = item => {
 	window.sessionStorage.setItem("curTabName", item.title);
 	const routeData = router.resolve({
-		path: "/exportControl/singleSanction",
+		path: "/finance/singleSanction",
 		query: {
 			id: item.sanId
 		}
@@ -842,7 +842,7 @@ const checkedTime = ref(["全部时间"]);
 const handleTitleClick = item => {
 	window.sessionStorage.setItem("curTabName", `${item.year}-${item.dateStr}《${item.title}》`);
 	const route = router.resolve({
-		path: "/exportControl/singleSanction",
+		path: "/finance/singleSanction",
 		query: {
 			id: item.id,
 			sanTypeId: item.sanTypeId
@@ -1638,7 +1638,7 @@ const handleSanc = item => {
 	console.log("activeResourceTabItem.value.id", activeResourceTabItem.value.id);
 	window.sessionStorage.setItem("curTabName", `${item.postDate}《${item.title}》`);
 	const route = router.resolve({
-		path: "/exportControl/singleSanction",
+		path: "/finance/singleSanction",
 		query: {
 			id: item.id,
 			sanTypeId: activeResourceTabItem.value.id.join(",")
@@ -1970,7 +1970,7 @@ const handleMediaClick = item => {
 			flex-wrap: wrap;
 			justify-content: space-between;
 			padding-left: 10px;
-			height: 156px;
+			max-height: 160px;
 			overflow: auto;
 
 			&-item {

src/views/finance/v2.0SingleSanction/components/sanctionsOverview/index.vue → src/views/finance/singleSanction/components/sanctionsOverview/index.vue

@@ -264,7 +264,7 @@ import {
 	getSingleSanctionOverviewList
 } from "@/api/exportControlV2.0";
 import { getRelateNews } from "@/api/finance";
-import RuleSubsidiaryDialog from "../../../v2.0EntityList/components/sanctionsOverview/components/listPage/RuleSubsidiaryDialog.vue";
+import RuleSubsidiaryDialog from "../../../entityList/components/sanctionsOverview/components/listPage/RuleSubsidiaryDialog.vue";
 import { useRoute } from "vue-router";
 
 import { useGotoCompanyPages } from "@/router/modules/company";