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

src/views/exportControl/index.vue

@@ -145,7 +145,9 @@
 														item.sanTypeId == allSanTypeIds[0] ? "新增中国实体" : "新增物项"
 													}}</span>
 												</div>
-												<div class="box1-absolute-num">{{ item.cnEntityCount }}家</div>
+												<div class="box1-absolute-num">
+													{{ item.cnEntityCount }}{{ item.sanTypeId == allSanTypeIds[0] ? "家" : "类" }}
+												</div>
 											</div>
 										</div>
 									</el-carousel-item>
@@ -328,9 +330,10 @@
 												<div
 													style="display: flex; justify-content: center; align-items: center; gap: 5px"
 												>
-													<el-tag v-for="tag in scope.row.tags" :key="tag" :type="getTagType(tag)">{{
+													<AreaTag v-for="tag in scope.row.tags" :key="tag" :tagName="tag" />
+													<!-- <el-tag v-for="tag in scope.row.tags" :key="tag" :type="getTagType(tag)">{{
 														tag
-													}}</el-tag>
+													}}</el-tag> -->
 												</div>
 											</template>
 										</el-table-column>
@@ -838,7 +841,7 @@ const handleToPosi = id => {
 const isRiskOverviewDetailOpen = ref(false);
 const riskOverviewDetailRow = ref(null);
 
-const handleToRiskSignalDetail = (item) => {
+const handleToRiskSignalDetail = item => {
 	riskOverviewDetailRow.value = item ?? null;
 	isRiskOverviewDetailOpen.value = true;
 };
@@ -3783,7 +3786,7 @@ const handleMediaClick = item => {
 	position: absolute;
 	right: 0px;
 	bottom: 15px;
-	z-index: 2;
+	z-index: 999;
 
 	:deep(.ai-pane-wrapper) {
 		display: none;

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

@@ -43,7 +43,7 @@
 				<div class="content">
 					<div class="info">
 						<div class="title">近期制裁新增</div>
-						<!-- <div class="subtitle">{{ totalCount.latestTime }}</div> -->
+						<div class="subtitle">{{ totalCount.latestTime }}</div>
 					</div>
 					<div class="number">
 						<span class="num">{{ totalCount.latestTimeCount }}</span>
@@ -412,8 +412,8 @@ const totalCount = ref(0);
 const getTotalCountData = async () => {
 	try {
 		const res = await getTotalCount(sanTypeId.value);
-		console.log('统计', res);
-		
+		console.log("统计", res);
+
 		totalCount.value = res.data || 0;
 	} catch (error) {
 		console.error("获取实体清单-数据统计-总量统计失败:", error);
@@ -1195,49 +1195,49 @@ const handlePieChartClick1 = val => {
 		query: params
 	});
 	window.open(route.href, "_blank");
-}
+};
 
 // 跳转到数据资源库
 const handleToDataLibrary = () => {
 	const route = router.resolve({
 		path: "/dataLibrary/dataEntityList",
-		query:{
+		query: {
 			isCnEntityOnly: true
 		}
 	});
 	window.open(route.href, "_blank");
-}
+};
 
 const handleToDataLibrary1 = () => {
 	const route = router.resolve({
 		path: "/dataLibrary/dataEntityList",
-		query:{
+		query: {
 			isCnEntityOnly: true,
 			isHalfRule: true
 		}
 	});
 	window.open(route.href, "_blank");
-}
+};
 
 const handleToDataLibrary2 = () => {
 	const route = router.resolve({
 		path: "/dataLibrary/dataEntityList",
-		query:{
-			selectedDate: JSON.stringify([currentYear+'01-01', currentYear+ '12-31'])
+		query: {
+			selectedDate: JSON.stringify([currentYear + "01-01", currentYear + "12-31"])
 		}
 	});
 	window.open(route.href, "_blank");
-}
+};
 
-const handleToDataLibrary3 = (time) => {
+const handleToDataLibrary3 = time => {
 	const route = router.resolve({
 		path: "/dataLibrary/dataEntityList",
-		query:{
+		query: {
 			selectedDate: JSON.stringify([time, time])
 		}
 	});
 	window.open(route.href, "_blank");
-}
+};
 
 onMounted(() => {
 	sanTypeId.value = route.query.sanTypeId || "";
@@ -1280,7 +1280,7 @@ onMounted(() => {
 			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 			position: relative;
 			cursor: pointer;
-			&:hover{
+			&:hover {
 				background: var(--color-primary-2);
 			}
 

src/views/finance/entityList/components/dataStatistics/index.vue

@@ -43,7 +43,7 @@
 				<div class="content">
 					<div class="info">
 						<div class="title">近期制裁新增</div>
-						<!-- <div class="subtitle">{{ totalCount.latestTime }}</div> -->
+						<div class="subtitle">{{ totalCount.latestTime }}</div>
 					</div>
 					<div class="number">
 						<span class="num">{{ totalCount.latestTimeCount }}</span>
@@ -1296,7 +1296,7 @@ onMounted(() => {
 	width: 1601px;
 	margin: 0 auto;
 	padding-top: 16px;
-	padding-bottom: 50px;
+	// padding-bottom: 50px;
 
 	.nav {
 		width: 100%;
@@ -1723,7 +1723,7 @@ onMounted(() => {
 	position: absolute;
 	right: 0px;
 	bottom: 15px;
-	z-index: 2;
+	z-index: 999;
 	:deep(.ai-pane-wrapper) {
 		display: none;
 	}

src/views/finance/index.vue

@@ -815,7 +815,7 @@ const handleToPosi = id => {
 const isRiskOverviewDetailOpen = ref(false);
 const riskOverviewDetailRow = ref(null);
 
-const handleToRiskSignalDetail = (item) => {
+const handleToRiskSignalDetail = item => {
 	riskOverviewDetailRow.value = item ?? null;
 	isRiskOverviewDetailOpen.value = true;
 };
@@ -1144,7 +1144,7 @@ const radarOption = ref({
 		confine: true
 	},
 	legend: {
-		show: false,
+		show: true,
 		top: "0%",
 		icon: "circle",
 		itemWidth: 12,
@@ -1212,7 +1212,7 @@ const fetchRadarData = async checked => {
 				"rgba(159, 122, 234, 1)",
 				"rgba(90, 200, 220, 1)"
 			];
-
+			console.log("图例 chaxun =>", data);
 			const seriesData = data.map((sanItem, index) => {
 				// 创建一个映射，将领域名称映射到数量
 				const domainMap = {};
@@ -1237,6 +1237,8 @@ const fetchRadarData = async checked => {
 				};
 			});
 
+			console.log("图例 chaxun 12 =>", seriesData);
+
 			// 更新雷达图指标
 			let maxValue = Math.max(...seriesData.flatMap(item => item.value)) * 1.2;
 			// 向上取整到最近的100的倍数，避免小数导致 ticks 不可读警告
@@ -1258,6 +1260,7 @@ const fetchRadarData = async checked => {
 					}
 				};
 			});
+			console.log("图例 =>", radarOption.value);
 			radarChart.interpret({ type: "雷达图", name: "实体清单领域分布情况", data: data });
 		}
 	} catch (error) {