export end

src/api/exportControlV2.0.js

@@ -292,10 +292,10 @@ export function getSingleSanctionOverviewList(data) {
  * @param {string} params.sanRecordId - 制裁记录ID
  * @header token
  */
-export function getSingleSanctionTotalCount(id) {
+export function getSingleSanctionTotalCount(sanTypeId, recordId) {
 	return request({
 		method: "GET",
-		url: `/api/sanctionList/statistics/total?sanTypeId=${id}`,
+		url: `/api/sanctionList/statistics/total?sanTypeId=${sanTypeId}&sanRecordId=${recordId}`,
 	});
 }
 

src/api/finance/index.js

+import request from "@/api/request.js";
\ No newline at end of file

src/views/exportControl/index.vue

@@ -77,7 +77,7 @@
 				<el-col :span="16">
 					<custom-container titleType="primary" title="最新出口管制政策" :titleIcon="houseIcon" height="450px">
 						<template #header-right>
-							<el-button type="primary" @click="handleToEntityList()" link>
+							<el-button type="primary" @click="handleToEntityList" link>
 								{{ "查看详情 >" }}
 							</el-button>
 						</template>
@@ -995,8 +995,6 @@ onMounted(async () => {
 
 		const maxCountItem1 = _.maxBy(cclList1, "count");
 		const maxCountForList1 = maxCountItem1 ? maxCountItem1.count : 0;
-		console.log("shuju list", list);
-		console.log("shuju total", total);
 		tableData1.value = _.map(list, item => {
 			return {
 				year: item.year,
@@ -1147,10 +1145,13 @@ const handleCarouselChange = index => {
 
 // 跳转到V2.0单次制裁
 const handleToEntityList = item => {
+	console.log("这是什么数据1 =>", item);
 	let id = item?.id;
+	let sanTypeId = item?.sanTypeId || 1;
 	if (!id) {
 		const currentItem = entitiesDataInfoList.value[currentCarouselIndex.value];
 		id = currentItem?.id;
+		sanTypeId = currentItem?.sanTypeId || 1;
 	}
 	window.sessionStorage.setItem(
 		"curTabName",
@@ -1159,7 +1160,8 @@ const handleToEntityList = item => {
 	const routeData = router.resolve({
 		path: "/exportControl/singleSanction",
 		query: {
-			id: id
+			id,
+			sanTypeId
 		}
 	});
 	// 打开一个新页面
@@ -2363,7 +2365,8 @@ const handleMediaClick = item => {
 		overflow-y: auto;
 
 		.home-top-bg {
-			background: url("./assets/images/background.png"),
+			background:
+				url("./assets/images/background.png"),
 				linear-gradient(180deg, rgba(229, 241, 254, 1) 0%, rgba(246, 251, 255, 0) 30%);
 			background-size: 100% 100%;
 			position: absolute;
@@ -3631,7 +3634,7 @@ const handleMediaClick = item => {
 	width: 100%;
 	display: flex;
 	align-items: center;
-	justify-content: center;
+	justify-content: flex-start;
 	padding: 22px 0;
 	.data-origin-icon {
 		width: 16px;

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

@@ -105,7 +105,7 @@
 						</div>
 					</template>
 					<!-- <div class="echarts" ref="sanctionCountChartRef"></div> -->
-					<EChart :option="sanctionCountChartOption" autoresize :style="{ height: '300px' }" />
+					<EChart :option="sanctionCountChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" />
 					<!-- <div class="bottom">
 						<div class="ai">
 							<div class="left">
@@ -186,7 +186,7 @@
 						</el-select>
 					</template>
 					<!-- <div class="echarts" ref="domainChartRef"></div> -->
-					<EChart :option="domainChartOption" autoresize :style="{ height: '300px' }" />
+					<EChart :option="domainChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" />
 					<!-- <div class="bottom">
 						<div class="ai">
 							<div class="left">
@@ -218,7 +218,7 @@
 						</el-select>
 					</template>
 					<!-- <div class="echarts" ref="typeChartRef"></div> -->
-					<EChart :option="typeChartOption" autoresize :style="{ height: '300px' }" />
+					<EChart :option="typeChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" />
 					<!-- <div class="bottom">
 						<div class="ai">
 							<div class="left">
@@ -717,8 +717,21 @@ const domainChartOption = ref({
 					width: 1.1
 				}
 			},
-			labelLayout: {
-				hideOverlap: true
+			labelLayout: function (params) {
+				// hideOverlap: true
+				const points = params.labelLinePoints;
+				const isLeft = params.labelRect.x < params.rect.x + params.rect.width / 2;
+
+				// 调整指示线终点到 label 垂直中心
+				const labelCenterY = params.labelRect.y + params.labelRect.height / 2;
+				points[2][1] = labelCenterY;
+
+				// 调整指示线终点到 label 水平边缘
+				points[2][0] = isLeft ? params.labelRect.x : params.labelRect.x + params.labelRect.width;
+
+				return {
+					labelLinePoints: points
+				};
 			},
 			itemStyle: {
 				borderWidth: 0
@@ -926,10 +939,23 @@ const typeChartOption = ref({
 				}
 			},
 			labelLayout: function (params) {
-				const isLeft = params.labelRect.x < chart.getWidth() / 2;
+				// const isLeft = params.labelRect.x < chart.getWidth() / 2;
+				// const points = params.labelLinePoints;
+				// points[2][0] = isLeft ? params.labelRect.x : params.labelRect.x + params.labelRect.width;
+				// return {
+				// 	labelLinePoints: points
+				// };
+
 				const points = params.labelLinePoints;
-				// Update the end point.
+				const isLeft = params.labelRect.x < params.rect.x + params.rect.width / 2;
+
+				// 调整指示线终点到 label 垂直中心
+				const labelCenterY = params.labelRect.y + params.labelRect.height / 2;
+				points[2][1] = labelCenterY;
+
+				// 调整指示线终点到 label 水平边缘
 				points[2][0] = isLeft ? params.labelRect.x : params.labelRect.x + params.labelRect.width;
+
 				return {
 					labelLinePoints: points
 				};
@@ -1508,8 +1534,8 @@ onMounted(() => {
 	width: 100%;
 	display: flex;
 	align-items: center;
-	justify-content: center;
-	padding: 22px 0;
+	justify-content: flex-start;
+	padding: 22px;
 	.data-origin-icon {
 		width: 16px;
 		height: 16px;

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

@@ -241,11 +241,11 @@ const handleClick = item => {
 	const route = router.resolve({
 		path: "/exportControl/singleSanction",
 		query: {
-			id: item.id
+			id: item.id,
+			sanTypeId: item.sanTypeId || 1
 		}
 	});
 	window.open(route.href, "_blank");
-	
 };
 
 const selectedDomain = ref(0);

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

@@ -54,7 +54,7 @@
 							</div>
 						</div>
 					</div> -->
-					<EChart :option="domainChartOption" autoresize :style="{ height: '300px' }" />
+					<EChart :option="domainChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" />
 					<div class="data-origin-box">
 						<div class="data-origin-icon">
 							<img :src="tipsIcon" alt="" />
@@ -104,7 +104,7 @@
 							</div>
 						</div>
 					</div> -->
-					<EChart :option="typeChartOption" autoresize :style="{ height: '300px' }" />
+					<EChart :option="typeChartOption" autoresize :style="{ height: '300px', padding: '0 20px' }" />
 					<div class="data-origin-box">
 						<div class="data-origin-icon">
 							<img :src="tipsIcon" alt="" />
@@ -348,7 +348,7 @@ const totalCount = ref({});
 const getTotalCount = async () => {
 	if (!sanRecordId.value) return;
 	try {
-		const res = await getSingleSanctionTotalCount(route.query.sanTypeId);
+		const res = await getSingleSanctionTotalCount(route.query.sanTypeId, sanRecordId.value);
 		if (res.code === 200) {
 			totalCount.value = res.data || {};
 		}
@@ -1264,8 +1264,8 @@ onMounted(() => {
 	width: 100%;
 	display: flex;
 	align-items: center;
-	justify-content: center;
-	padding: 22px 0;
+	justify-content: flex-start;
+	padding: 22px;
 	.data-origin-icon {
 		width: 16px;
 		height: 16px;

src/views/exportControl/v2.0SingleSanction/components/impactAnalysis/components/industrialImpact/index.vue

@@ -1317,7 +1317,7 @@ onMounted(async () => {
 	width: 100%;
 	display: flex;
 	align-items: center;
-	justify-content: center;
+	justify-content: flex-start;
 	padding: 30px 0;
 	.data-origin-icon {
 		width: 16px;

src/views/exportControl/v2.0SingleSanction/components/impactAnalysis/components/researchImpact/index.vue

@@ -1543,7 +1543,7 @@ onBeforeUnmount(() => {
 	width: 100%;
 	display: flex;
 	align-items: center;
-	justify-content: center;
+	justify-content: flex-start;
 	padding: 35px 0;
 	.data-origin-icon {
 		width: 16px;

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

@@ -52,7 +52,7 @@
 			:close-on-click-modal="false"
 			@close="resetModal"
 		>
-			<div class="sanction-list">
+			<div class="sanction-list" :loading="loading">
 				<div
 					v-for="item in sanctionList"
 					:key="item.id"
@@ -61,6 +61,7 @@
 					@click="selectSanction(item)"
 				>
 					{{ item.name }}
+					<div class="sanction-type">{{ item.postDate }}</div>
 				</div>
 			</div>
 
@@ -193,6 +194,7 @@ const handleAnalysisClick = () => {
 };
 
 // ========== 新增响应式状态 ==========
+const loading = ref(false);
 const sanctionModalVisible = ref(false);
 const sanctionList = ref([]);
 const selectedSanctionId = ref(null);
@@ -204,6 +206,7 @@ const totalElements = ref(0);
 const openSanctionModal = async () => {
 	sanctionModalVisible.value = true;
 	console.log("制裁事件列表11:", sanctionList.value);
+	loading.value = true;
 	await fetchSanctionData();
 };
 
@@ -211,6 +214,7 @@ const openSanctionModal = async () => {
 const fetchSanctionData = async () => {
 	try {
 		const res = await getSanctionProcess([1], currentPage.value, 10);
+		loading.value = false;
 		if (res && !!res.content) {
 			sanctionList.value = res.content || [];
 			totalElements.value = res.totalElements || 0;
@@ -225,6 +229,7 @@ const fetchSanctionData = async () => {
 		}
 	} catch (error) {
 		console.error("获取制裁事件失败:", error);
+		loading.value = false;
 		sanctionList.value = [];
 		totalElements.value = 0;
 	}
@@ -237,7 +242,7 @@ const handlePageChange = async newPage => {
 };
 
 // ========== 选择某项 ==========
-const selectSanction = item => {
+const selectSanction = async item => {
 	selectedSanctionId.value = item.id;
 	router.replace({
 		path: window.location.pathname,
@@ -247,7 +252,10 @@ const selectSanction = item => {
 		}
 	});
 	sanctionModalVisible.value = false;
-	window.location.reload();
+	console.log("跳转URL:", window.location.href);
+	// 根据最新URL参数刷新当前页面
+
+	window.open(`${window.location.pathname}?id=${item.id}&sanTypeId=${item.sanTypeId}`, "_self");
 };
 
 // ========== 关闭弹窗时重置 ==========
@@ -467,6 +475,8 @@ onMounted(() => {
 	font-size: 14px;
 	color: #333;
 	transition: background-color 0.2s;
+	display: flex;
+	justify-content: space-between;
 }
 
 .sanction-item:hover {

src/views/finance/index.vue

@@ -12,8 +12,13 @@
 			<div class="home-top-bg"></div>
 			<div class="home-main-header">
 				<div class="home-main-header-center">
-					<SearchContainer style="margin-bottom: 0; height: fit-content" v-if="containerRef" placeholder="搜索投融资限制政策"
-						:containerRef="containerRef" areaName="" />
+					<SearchContainer
+						style="margin-bottom: 0; height: fit-content"
+						v-if="containerRef"
+						placeholder="搜索投融资限制政策"
+						:containerRef="containerRef"
+						areaName=""
+					/>
 					<!-- <el-input
 						v-model="searchKey"
 						style="width: 100%; height: 48px"
@@ -76,12 +81,23 @@
 					<ClickableCard text="资源库" @click="scrollToTop('position4')" target="_blank" />
 				</div> -->
 				<div class="home-main-header-footer-info">
-					<div class="card" v-for="(item, index) in infoList" :key="index">
+					<!-- <div class="card" v-for="(item, index) in infoList" :key="index">
 						<div class="icon" :style="{ background: item.color }"></div>
 						<div class="title">{{ item.title }}</div>
 						<div class="content">{{ item.des }}</div>
 						<div class="num" :style="{ color: item.color }">{{ item.num + "项" }}</div>
-					</div>
+					</div> -->
+					<InfoCard
+						v-for="(item, index) in infoList"
+						:key="item.id"
+						:title="item.nameZh"
+						:subtitle="item.nameAbbr"
+						:description="item.description"
+						:quantity="item.postCount"
+						unit="个"
+						:color="infoListColor[index]"
+						@click="handleToEntityListNoId(item)"
+					/>
 				</div>
 			</div>
 
@@ -110,9 +126,17 @@
 										</div>
 										<div class="box1-top-content-item">
 											<span class="box1-top-content-item-title">· 涉及领域：</span>
-											<div class="box1-top-content-item-tags" v-for="item in ['航空航天', '人工智能', '集成电路']" :key="item">
-												<el-tag :type="item === '航空航天' ? 'primary' : item === '人工智能' ? 'danger' : 'info'
-													">{{ item }}</el-tag>
+											<div
+												class="box1-top-content-item-tags"
+												v-for="item in ['航空航天', '人工智能', '集成电路']"
+												:key="item"
+											>
+												<el-tag
+													:type="
+														item === '航空航天' ? 'primary' : item === '人工智能' ? 'danger' : 'info'
+													"
+													>{{ item }}</el-tag
+												>
 											</div>
 										</div>
 									</div>
@@ -170,8 +194,14 @@
 						</template>
 					</custom-container> -->
 
-					<RiskSignal :list="warningList" @item-click="handleToRiskSignalDetail" @more-click="handleToMoreRiskSignal"
-						riskLevel="status" postDate="time" name="title" />
+					<RiskSignal
+						:list="warningList"
+						@item-click="handleToRiskSignalDetail"
+						@more-click="handleToMoreRiskSignal"
+						riskLevel="status"
+						postDate="time"
+						name="title"
+					/>
 				</el-col>
 			</el-row>
 			<el-row :gutter="20" style="width: 1600px; margin: 0 auto">
@@ -195,11 +225,22 @@
 
 			<div class="center-center">
 				<div class="center-center-news">
-					<NewsList :newsList="customNewsData" @item-click="handleNewsInfoClick" @more-click="handleToMoreNews"
-						from="from" content="description" title="title" img="image" />
-				</div>
-				<MessageBubble :messageList="messageList" @person-click="handlePerClick" imageUrl="avatar"
-					@more-click="handleToSocialDetail" />
+					<NewsList
+						:newsList="customNewsData"
+						@item-click="handleNewsInfoClick"
+						@more-click="handleToMoreNews"
+						from="from"
+						content="description"
+						title="title"
+						img="image"
+					/>
+				</div>
+				<MessageBubble
+					:messageList="messageList"
+					@person-click="handlePerClick"
+					imageUrl="avatar"
+					@more-click="handleToSocialDetail"
+				/>
 				<!-- <div class="boxs4">
 					<custom-container title="社交媒体" :titleIcon="dialogIcon" height="450px">
 						<template #default>
@@ -239,18 +280,27 @@
 											<template #default="scope">
 												<div style="display: flex; align-items: center">
 													<span style="margin-right: 10px; width: 40px">{{ scope.row.num }}次</span>
-													<el-progress :percentage="scope.row.percent * 100" :show-text="false"
-														:status="getStatus(scope.row.percent)" />
+													<el-progress
+														:percentage="scope.row.percent * 100"
+														:show-text="false"
+														:status="getStatus(scope.row.percent)"
+													/>
 												</div>
 											</template>
 										</el-table-column>
 										<el-table-column label="重点领域" width="180">
 											<template #default="scope">
 												<div style="display: flex; align-items: center; gap: 5px">
-													<el-tag v-for="tag in scope.row.tags" :key="tag" :type="tag === '通信网络'
+													<el-tag
+														v-for="tag in scope.row.tags"
+														:key="tag"
+														:type="
+															tag === '通信网络'
 																? 'primary'
 																: TAGTYPE[Math.floor(Math.random() * 5)]
-														">{{ tag }}</el-tag>
+														"
+														>{{ tag }}</el-tag
+													>
 												</div>
 											</template>
 										</el-table-column>
@@ -264,18 +314,27 @@
 											<template #default="scope">
 												<div style="display: flex; align-items: center">
 													<span style="margin-right: 10px; width: 40px">{{ scope.row.num }}次</span>
-													<el-progress :percentage="scope.row.percent * 100" :show-text="false"
-														:status="getStatus(scope.row.percent)" />
+													<el-progress
+														:percentage="scope.row.percent * 100"
+														:show-text="false"
+														:status="getStatus(scope.row.percent)"
+													/>
 												</div>
 											</template>
 										</el-table-column>
 										<el-table-column label="重点领域" width="180">
 											<template #default="scope">
 												<div style="display: flex; align-items: center; gap: 5px">
-													<el-tag v-for="tag in scope.row.tags" :key="tag" :type="tag === '通信网络'
+													<el-tag
+														v-for="tag in scope.row.tags"
+														:key="tag"
+														:type="
+															tag === '通信网络'
 																? 'primary'
 																: TAGTYPE[Math.floor(Math.random() * 5)]
-														">{{ tag }}</el-tag>
+														"
+														>{{ tag }}</el-tag
+													>
 												</div>
 											</template>
 										</el-table-column>
@@ -289,18 +348,27 @@
 											<template #default="scope">
 												<div style="display: flex; align-items: center">
 													<span style="margin-right: 10px; width: 40px">{{ scope.row.num }}次</span>
-													<el-progress :percentage="scope.row.percent * 100" :show-text="false"
-														:status="getStatus(scope.row.percent)" />
+													<el-progress
+														:percentage="scope.row.percent * 100"
+														:show-text="false"
+														:status="getStatus(scope.row.percent)"
+													/>
 												</div>
 											</template>
 										</el-table-column>
 										<el-table-column label="重点领域" width="180">
 											<template #default="scope">
 												<div style="display: flex; align-items: center; gap: 5px">
-													<el-tag v-for="tag in scope.row.tags" :key="tag" :type="tag === '通信网络'
+													<el-tag
+														v-for="tag in scope.row.tags"
+														:key="tag"
+														:type="
+															tag === '通信网络'
 																? 'primary'
 																: TAGTYPE[Math.floor(Math.random() * 5)]
-														">{{ tag }}</el-tag>
+														"
+														>{{ tag }}</el-tag
+													>
 												</div>
 											</template>
 										</el-table-column>
@@ -357,7 +425,8 @@
 									</div>
 								</div>
 								<div class="box4-footer">
-									<el-button type="primary" link :icon="DownRight">查看更多
+									<el-button type="primary" link :icon="DownRight"
+										>查看更多
 										<el-icon>
 											<DArrowRight />
 										</el-icon>
@@ -374,8 +443,15 @@
 						</template>
 						<template #default>
 							<div class="box5">
-								<el-table :data="paginatedData" class="sanction-table" stripe empty-text="暂无数据" height="700px"
-									header-row-class-name="table-header" row-class-name="table-row">
+								<el-table
+									:data="paginatedData"
+									class="sanction-table"
+									stripe
+									empty-text="暂无数据"
+									height="700px"
+									header-row-class-name="table-header"
+									row-class-name="table-row"
+								>
 									<!-- <el-table-column prop="index" label="序号" width="80" align="center">
 										<template #default="scope">
 											{{ scope.$index + 1 + (currentPage - 1) * pageSize }}
@@ -384,12 +460,14 @@
 
 									<el-table-column prop="name" label="实体名称" min-width="200">
 										<template #default="scope">
-											<div style="
+											<div
+												style="
 													font-weight: 700;
 													font-size: 16px;
 													color: rgba(59, 65, 75, 1);
 													font-family: Microsoft YaHei;
-												">
+												"
+											>
 												{{ scope.row.name }}
 											</div>
 										</template>
@@ -398,8 +476,12 @@
 									<el-table-column prop="domains" label="涉及领域" min-width="180">
 										<template #default="scope">
 											<div class="domain-tags">
-												<el-tag v-for="tag in scope.row.domains" :key="tag"
-													:type="tag === '通信网络' ? 'primary' : 'danger'">{{ tag }}</el-tag>
+												<el-tag
+													v-for="tag in scope.row.domains"
+													:key="tag"
+													:type="tag === '通信网络' ? 'primary' : 'danger'"
+													>{{ tag }}</el-tag
+												>
 											</div>
 										</template>
 									</el-table-column>
@@ -435,7 +517,9 @@
 
 									<el-table-column prop="revenue" label="50%规则子企业" width="140" align="right">
 										<template #default="scope">
-											<span :class="['revenue-cell', scope.row.revenue === '无营收数据' ? 'no-revenue' : '']">
+											<span
+												:class="['revenue-cell', scope.row.revenue === '无营收数据' ? 'no-revenue' : '']"
+											>
 												{{ scope.row.revenue }}
 											</span>
 										</template>
@@ -446,8 +530,14 @@
 									<!-- <div class="pagination-info">
                     第{{ currentPage }}页，共{{ totalPages }}页
                   </div> -->
-									<el-pagination v-model:current-page="currentPage" :page-size="pageSize" :total="total"
-										:pager-count="5" layout="prev, pager, next" background />
+									<el-pagination
+										v-model:current-page="currentPage"
+										:page-size="pageSize"
+										:total="total"
+										:pager-count="5"
+										layout="prev, pager, next"
+										background
+									/>
 								</div>
 							</div>
 						</template>
@@ -494,12 +584,6 @@ import entityIcon from "./assets/images/icon-entity.png";
 
 import newsImg from "@/assets/images/news-img.png";
 
-import headerIcon1 from "./assets/icons/header-icon1.png";
-import headerIcon2 from "./assets/icons/header-icon2.png";
-import headerIcon3 from "./assets/icons/header-icon3.png";
-import headerIcon4 from "./assets/icons/header-icon4.png";
-import headerIcon5 from "./assets/icons/header-icon5.png";
-
 import getMultiLineChart from "./utils/multiLineChart";
 
 import bill1 from "./assets/images/bill1.png";
@@ -1218,7 +1302,7 @@ const handleGetHylyList = async () => {
 			hylymc: "全部分类"
 		};
 		categoryList.value = [obj, ...categoryList.value];
-	} catch (error) { }
+	} catch (error) {}
 };
 
 const chart1Data = ref({
@@ -1264,7 +1348,7 @@ const handleGetBillsByType = async () => {
 				img: bill1
 			};
 		});
-	} catch (error) { }
+	} catch (error) {}
 };
 // 查看社交媒体详情
 const handleToSocialDetail = item => {