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

src/api/exportControl.js

@@ -393,13 +393,13 @@ export function getDomainDistribution(sanctionDate = "2025-11-11") {
  * startTime: string
  * }[]>}
  */
-export function getEntitiesList(sanTypeIds = ["1"], pageNum = 1, pageSize = 10, sanctionDate = "", isCn = false) {
+export function getEntitiesList(sanTypeId="1", pageNum = 1, pageSize = 10, sanctionDate = "", isCn = false) {
 	return request200(
 		request({
 			method: "POST",
 			url: "/api/sanctionList/pageQuery",
 			data: {
-				sanTypeIds,
+				sanTypeId,
 				pageNum,
 				pageSize,
 				sanctionDate,

src/views/exportControl/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>
@@ -1494,7 +1494,7 @@ watch(
 const fetchEntitiesList = async (page = 1, size = 10) => {
 	try {
 		console.log("activeResourceTabItem.value.id", activeResourceTabItem.value.id);
-		const res = await getEntitiesList(activeResourceTabItem.value.id.join(","), page, size);
+		const res = await getEntitiesList(activeResourceTabItem.value.id, page, size);
 		if (res) {
 			entitiesList.value = res.content.map(item => ({
 				...item,

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

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

src/views/finance/index.vue

@@ -1377,7 +1377,7 @@ watch(
 const fetchEntitiesList = async (page = 1, size = 10) => {
 	try {
 		console.log("activeResourceTabItem.value.id", activeResourceTabItem.value.id);
-		const res = await getEntitiesList(activeResourceTabItem.value.id, page, size);
+		const res = await getEntitiesList(activeResourceTabItem.value.id.join(","), page, size);
 		if (res) {
 			entitiesList.value = res.content.map(item => ({
 				...item,
@@ -1773,7 +1773,7 @@ onMounted(async () => {
 		fetchSocialMediaInfo();
 		// 获取新闻资讯
 		fetchNewsInfo();
-		fetchEntitiesList(currentPage.value, pageSize.value);
+		// fetchEntitiesList(currentPage.value, pageSize.value);
 		await fetchSanctionProcess(sanctionPage.value, 10);
 		// 获取雷达图数据
 		await fetchRadarData(domainChecked.value);