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

src/views/exportControl/components/RuleSubsidiaryDialog.vue

@@ -37,7 +37,7 @@
 					<template #default="{ row }">
 						<div class="entity-name-cell">
 							<el-avatar class="avatar" :size="24" :src="row.avatar || defaultIcon" />
-							<div class="name" :title="row.name">{{ row.name }}</div>
+							<div class="name" @click="handleCompClick(row)" :title="row.name">{{ row.name }}</div>
 						</div>
 					</template>
 				</el-table-column>
@@ -81,6 +81,8 @@
 import { ref, defineProps, defineEmits, computed, watch } from "vue";
 import { Close } from "@element-plus/icons-vue";
 import defaultIcon from "@/assets/icons/default-icon1.png";
+import { useGotoCompanyPages } from "@/router/modules/company";
+const gotoCompanyPages = useGotoCompanyPages();
 
 const props = defineProps({
 	modelValue: {
@@ -118,9 +120,9 @@ const tableData = computed(() => {
 		...item,
 		name: item.orgName,
 		domains: item.techDomains || [],
-		equityRatio: item.equityRatio ? (item.equityRatio * 100).toFixed(2) + '%' : '--',
-		location: '--',
-		revenue: item.revenue || '--'
+		equityRatio: item.equityRatio ? (item.equityRatio * 100).toFixed(2) + "%" : "--",
+		location: "--",
+		revenue: item.revenue || "--"
 	}));
 });
 
@@ -149,6 +151,13 @@ const getTagStyle = tag => {
 	const index = Math.abs(hash) % colorPool.length;
 	return colorPool[index];
 };
+
+// 跳转公司详情页
+const handleCompClick = item => {
+	console.log("item", item);
+	window.sessionStorage.setItem("curTabName", item.name || item.orgName);
+	gotoCompanyPages(item.id);
+};
 </script>
 
 <style lang="scss" scoped>
@@ -260,6 +269,7 @@ const getTagStyle = tag => {
 	.entity-name-cell {
 		display: flex;
 		align-items: center;
+		cursor: pointer;
 		.avatar {
 			flex: 0 0 24px;
 			margin-right: 9px;
@@ -347,4 +357,4 @@ const getTagStyle = tag => {
 		}
 	}
 }
-</style>
\ No newline at end of file
+</style>

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

@@ -355,7 +355,7 @@ const getSanctionOverviewList = async () => {
 
 // 单次制裁-制裁概况-制裁背景
 const timelinePage = ref(1);
-const timelinePageSize = ref(3);
+const timelinePageSize = ref(5);
 const hasMore = ref(true);
 
 const getSanctionBackground = async (isLoadMore = false) => {
@@ -757,7 +757,7 @@ onMounted(() => {
 
 				.left-bottom-content {
 					padding: 20px 25px 0 25px;
-					height: calc(100% - 45px); // 减去标题高度
+					height: calc(100% - 20px); // 减去标题高度
 					display: flex;
 					flex-direction: column;