update

src/components/headerMenu.vue

@@ -247,6 +247,7 @@ const rightList = ref([
 	width: 100%;
 	height: 299px;
 	background: rgb(249, 249, 249);
+	box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.3);
 	display: flex;
 	.left {
 		margin-top: 35px;

src/views/companyPages/index.vue

@@ -3,7 +3,7 @@
 		<!-- 公司导航栏 -->
 		<div class="company-nav">
 			<div class="company-logo-title">
-				<img :src="infoData.logoUrl" class="logo-img" />
+				<img :src="infoData.logoUrl?infoData.logoUrl:defaultCompanyIcon" class="logo-img" />
 				<div class="title-group">
 					<h1 class="company-name">{{ infoData.orgName }}</h1>
 					<p class="company-english">{{ infoData.orgNameEn }}</p>
@@ -131,7 +131,7 @@
 						<div class="personnel-grid">
 							<div class="personnel-card" v-for="(person, idx) in mainPersonnel" :key="idx">
 								<div class="personnel-card-header">
-									<img :src="person.avatarUrl" class="person-avatar" />
+									<img :src="person.avatarUrl?person.avatarUrl:defaultUserIcon" class="person-avatar" />
 									<div class="person-info">
 										<h4 class="person-name">{{ person.name }}</h4>
 										<p class="person-position">{{ person.position }}</p>
@@ -193,6 +193,9 @@ import TabIcon2Active from "./images/tab-icon2-active.png";
 import TabIcon3Active from "./images/tab-icon3-active.png";
 import TabIcon4Active from "./images/tab-icon4-active.png";
 
+import defaultUserIcon from "@/assets/icons/default-icon1.png"
+import defaultCompanyIcon from "@/assets/icons/default-icon2.png"
+
 const router = useRouter();
 const tabList = ref([
 	{

src/views/exportControl/index.vue

@@ -1064,8 +1064,8 @@ const handleEntityClick = item => {
 	const route = router.resolve({
 		name: "companyPages",
 		params: {
-			startTime: item.startTime,
-			id: item.id
+			// startTime: item.startTime,
+			id: item.entityId
 		}
 	});
 	window.open(route.href, "_blank");

src/views/exportControl/v2.0EntityList/components/sanctionsOverview/components/listPage/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>
@@ -79,8 +79,9 @@
 
 <script setup>
 import { ref, defineProps, defineEmits, computed, watch } from "vue";
+import router from "@/router";
 import { Close } from "@element-plus/icons-vue";
-import defaultIcon from "../../../../../assets/icons/default-avatar.png";
+import defaultIcon from "@/assets/icons/default-icon1.png";
 
 const props = defineProps({
 	modelValue: {
@@ -149,6 +150,20 @@ 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.entityNameZh || item.entityName)
+	const route = router.resolve({
+		name: "companyPages",
+		params: {
+			id: item.id
+		}
+	});
+	window.open(route.href, "_blank");
+};
+
 </script>
 
 <style lang="scss" scoped>
@@ -271,6 +286,7 @@ const getTagStyle = tag => {
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
+			cursor: pointer;
 		}
 	}
 

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

@@ -127,7 +127,7 @@ const handleCompClick = item => {
 	const route = router.resolve({
 		name: "companyPages",
 		params: {
-			id: item.id
+			id: item.entityId
 		}
 	});
 	window.open(route.href, "_blank");

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

@@ -475,34 +475,34 @@ const initDomainChart = () => {
 			{
 				name: "制裁实体领域分布",
 				type: "pie",
-				radius: [73.5, 89.5],
+				radius: [65, 81],
 				center: ["50%", "50%"],
 				startAngle: 90,
 				data: data,
 				label: {
 					show: true,
 					alignTo: "edge",
-					minMargin: 5,
-					edgeDistance: 10,
+          minMargin: 5,
+          edgeDistance: 10,
 					formatter: params => {
-						return "{name|" + params.name + "}\n{value|" + params.value + "家 " + params.percent + "%}";
+						return "{name|" + params.name + "} \n {value|" + params.value + "家 " + params.percent + "%}";
 					},
 					rich: {
 						name: {
 							fontSize: 18,
 							fontWeight: 700,
 							color: "rgb(59, 65, 75)",
-							padding: [0, 0, 5, 0],
+							padding: [10, 0, 10, 0],
 							fontFamily: "Microsoft YaHei",
-							lineHeight: 26
+							lineHeight: 22
 						},
 						value: {
 							fontSize: 16,
 							fontWeight: 400,
 							color: "rgb(95, 101, 108)",
 							fontFamily: "Microsoft YaHei",
-							lineHeight: 24,
-							padding: [5, 0, 0, 0]
+							lineHeight: 22,
+							padding: [10, 0, 10, 0]
 						}
 					}
 				},

src/views/exportControl/v2.0SingleSanction/components/deepMining/utils/treeChart.js

+
+
+const getTreeChart = (treeData) => {
+  const option = {
+    series: [{
+      type: 'tree',
+      layout: 'orthogonal', // 从上到下布局
+      orient: 'TB', // Top to Bottom
+      data: treeData,
+      top: '10%',
+      bottom: '5%',
+      left: '10%',
+      right: '10%',
+      symbol: 'circle',
+      symbolSize: 40,
+      label: {
+        position: 'bottom',
+        verticalAlign: 'middle',
+        align: 'center'
+      },
+      leaves: {
+        label: {
+          position: 'top',
+          verticalAlign: 'middle',
+          align: 'center'
+        }
+      },
+      lineStyle: {
+        color: '#ccc',
+        width: 2,
+        type: 'dashed' // 虚线
+      },
+      emphasis: {
+        focus: 'descendant'
+      },
+      expandAndCollapse: true,
+      initialTreeDepth: 3
+    }]
+  };
+
+  return option
+}
+
+export default getTreeChart
\ No newline at end of file

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

@@ -93,7 +93,7 @@
           </div>
         </div>
       </div>
-      <div class="right">
+      <div class="right" v-loading="isLoading">
         <div class="title-com">
           <div class="box"></div>
           <div class="text">制裁清单</div>
@@ -239,8 +239,11 @@ const addRuleCount = ref(0)
 const removeCount = ref(0)
 const removeRuleCount = ref(0)
 
+const isLoading = ref(false)
+
 // 调用单次制裁-制裁概况-制裁清单接口
 const getSanctionOverviewList = async () => {
+  isLoading.value = true
   try {
     const res = await getSingleSanctionOverviewList({
       sanRecordId: sanRecordId.value,
@@ -249,6 +252,7 @@ const getSanctionOverviewList = async () => {
       searchText: searchKeyword.value || undefined,
       searchType: searchType.value
     })
+    isLoading.value = false
     if (res.code === 200) {
       const data = res.data || {}
       addCount.value = data.addCount || 0