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

src/views/exportControl/index.vue

@@ -274,7 +274,7 @@
 			<el-row :gutter="20" style="width: 1600px; margin: 0 auto; height: 528px; margin-top: 64px">
 				<CustomTitle id="position3" title="数据总览" />
 				<el-col :span="24">
-					<custom-container title="发布频度" :titleIcon="box3Icon" height="450px">
+					<custom-container title="发布频度" :titleIcon="box3Icon" height="400px">
 						<template #default>
 							<div class="box3">
 								<div class="box3-content">

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

 <template>
 	<div class="deep-mining" :class="{ deepMiningChartmode: isInChart }">
 		<div class="side-nav">
-			<div v-for="(item, index) in activeTab" :key="index" class="tab-item" :class="{ active: index === activeIndex }"
-				@click="activeIndex = index">
+			<div
+				v-for="(item, index) in activeTab"
+				:key="index"
+				class="tab-item"
+				:class="{ active: index === activeIndex }"
+				@click="activeIndex = index"
+			>
 				{{ item }}
 				<span v-if="index === activeIndex" class="arrow"></span>
 			</div>
@@ -47,8 +52,13 @@
 									<span class="group-count">{{ group.count }}家</span>
 								</div>
 								<div class="group-children custom-scrollbar" v-show="group.expanded">
-									<div class="entity-item" v-for="item in group.children" :key="item.id"
-										:class="{ active: activeEntityId === item.id }" @click="selectEntity(item)">
+									<div
+										class="entity-item"
+										v-for="item in group.children"
+										:key="item.id"
+										:class="{ active: activeEntityId === item.id }"
+										@click="selectEntity(item)"
+									>
 										<div class="item-icon">
 											<img :src="defaultTitle" alt="" class="item-img" />
 										</div>
@@ -63,12 +73,19 @@
 			<div class="right" @mouseenter="handleMouseEnter" @mouseleave="handleMouseLeave">
 				<div class="title-com custom-right-header">
 					<div class="toggle-group">
-						<div class="toggle-btn" :class="{ active: rightActiveTab === 'supplyChain' }"
-							@click="rightActiveTab = 'supplyChain'">
+						<div
+							class="toggle-btn"
+							:class="{ active: rightActiveTab === 'supplyChain' }"
+							@click="rightActiveTab = 'supplyChain'"
+						>
 							<img :src="rightActiveTab === 'supplyChain' ? icon01Active : icon01" alt="" />
 							<span>供应链</span>
 						</div>
-						<div class="toggle-btn" :class="{ active: rightActiveTab === 'equity' }" @click="rightActiveTab = 'equity'">
+						<div
+							class="toggle-btn"
+							:class="{ active: rightActiveTab === 'equity' }"
+							@click="rightActiveTab = 'equity'"
+						>
 							<img :src="rightActiveTab === 'equity' ? icon02Active : icon02" alt="" />
 							<span>股权</span>
 						</div>
@@ -115,8 +132,8 @@ import {
 	getSingleSanctionEntitySupplyChain,
 	getSingleSanctionEntityEquity
 } from "@/api/exportControlV2.0";
-import RelationGraph from './components/RelationGraph.vue';
-import AnalysisBox from '@/components/base/boxBackground/analysisBox.vue';
+import RelationGraph from "./components/RelationGraph.vue";
+import AnalysisBox from "@/components/base/boxBackground/analysisBox.vue";
 
 const sanRecordId = ref("");
 const activeTab = ref(["实体穿透分析"]);
@@ -170,11 +187,11 @@ const handleMouseLeave = () => {
 	isInChart.value = false;
 };
 
-const handleNodeClick = (node) => {
+const handleNodeClick = node => {
 	selectedNode.value = node;
 };
 
-const handleLayoutChange = (type) => {
+const handleLayoutChange = type => {
 	controlActive.value = type;
 	if (type !== 2) {
 		isInChart.value = true;
@@ -184,9 +201,8 @@ const handleLayoutChange = (type) => {
 };
 
 const updateGraphData = () => {
-	const data = rightActiveTab.value === 'supplyChain'
-		? singleSanctionEntitySupplyChainData.value
-		: singleSanctionEntityEquityData.value;
+	const data =
+		rightActiveTab.value === "supplyChain" ? singleSanctionEntitySupplyChainData.value : singleSanctionEntityEquityData.value;
 
 	if (!data) return;
 
@@ -214,7 +230,7 @@ const updateGraphData = () => {
 		links.push({
 			source: `p-${item.id || index}`,
 			target: "0",
-			name: rightActiveTab.value === 'supplyChain' ? "供应商" : (item.type || "持股")
+			name: rightActiveTab.value === "supplyChain" ? "供应商" : item.type || "持股"
 		});
 	});
 
@@ -231,14 +247,14 @@ const updateGraphData = () => {
 		links.push({
 			source: "0",
 			target: `c-${item.id || index}`,
-			name: rightActiveTab.value === 'supplyChain' ? "客户" : (item.type || "投资")
+			name: rightActiveTab.value === "supplyChain" ? "客户" : item.description || "投资"
 		});
 	});
 
 	graphData.value = { nodes, links };
 };
 
-const updateTreeData = (data) => {
+const updateTreeData = data => {
 	if (!data) return;
 
 	treeData.value = {
@@ -318,17 +334,17 @@ const getSingleSanctionEntityListRequest = async () => {
 	}
 };
 
-watch(rightActiveTab, async (newTab) => {
-	if (newTab === 'supplyChain') {
+watch(rightActiveTab, async newTab => {
+	if (newTab === "supplyChain") {
 		await getSingleSanctionEntitySupplyChainRequest();
 	} else {
 		await getSingleSanctionEntityEquityRequest();
 	}
 });
 
-watch(activeEntityId, async (newId) => {
+watch(activeEntityId, async newId => {
 	if (newId) {
-		if (rightActiveTab.value === 'supplyChain') {
+		if (rightActiveTab.value === "supplyChain") {
 			await getSingleSanctionEntitySupplyChainRequest();
 		} else {
 			await getSingleSanctionEntityEquityRequest();
@@ -337,7 +353,7 @@ watch(activeEntityId, async (newId) => {
 });
 
 watch(is50PercentRule, async () => {
-	if (rightActiveTab.value === 'equity') {
+	if (rightActiveTab.value === "equity") {
 		await getSingleSanctionEntityEquityRequest();
 	}
 });
@@ -857,7 +873,6 @@ onMounted(async () => {
 }
 
 .title-com.custom-right-header {
-
 	.box,
 	.text {
 		display: none;