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

package-lock.json

@@ -199,6 +199,7 @@
       "resolved": "https://registry.npmmirror.com/@antv/g6/-/g6-4.8.25.tgz",
       "integrity": "sha512-8mdTnN9QMVNQZtlXmftL8fvRsa4L+GajK58Zp51wyrGLFyjeop8R0QSkCALW45DWP2TaQeZAPtjhQUU/wf5hIg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@antv/g6-pc": "0.8.25"
       }
@@ -2171,6 +2172,7 @@
       "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/lodash": "*"
       }
@@ -2287,6 +2289,7 @@
       "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.21.tgz",
       "integrity": "sha512-SXlyk6I5eUGBd2v8Ie7tF6ADHE9kCR6mBEuPyH1nUZ0h6Xx6nZI29i12sJKQmzbDyr2tUHMhhTt51Z6blbkTTQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/parser": "^7.28.3",
         "@vue/compiler-core": "3.5.21",
@@ -2893,6 +2896,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -3251,6 +3255,7 @@
       "resolved": "https://registry.npmmirror.com/cytoscape/-/cytoscape-3.33.1.tgz",
       "integrity": "sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10"
       }
@@ -3648,6 +3653,7 @@
       "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -3736,6 +3742,7 @@
       "version": "0.8.5",
       "resolved": "https://registry.npmmirror.com/dagre/-/dagre-0.8.5.tgz",
       "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==",
+      "peer": true,
       "dependencies": {
         "graphlib": "^2.1.8",
         "lodash": "^4.17.15"
@@ -3943,6 +3950,7 @@
       "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz",
       "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "tslib": "2.3.0",
         "zrender": "5.6.1"
@@ -5334,13 +5342,15 @@
       "version": "4.18.1",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
       "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash-es": {
       "version": "4.18.1",
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
       "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash-unified": {
       "version": "1.0.3",
@@ -5388,6 +5398,7 @@
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
       "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "argparse": "^2.0.1",
         "entities": "^4.4.0",
@@ -6467,6 +6478,7 @@
       "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -6563,6 +6575,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -6964,6 +6977,7 @@
       "integrity": "sha512-VmtB2rFU/GroZ4oL8+ZqXgSA38O6GR8KSIvWmEFv63pQ0G6KaBH9s07PO8XTXP4vI+3UJUEypOfjkGfmSBBR0w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -8134,6 +8148,7 @@
       "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
@@ -8193,6 +8208,7 @@
       "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.21.tgz",
       "integrity": "sha512-xxf9rum9KtOdwdRkiApWL+9hZEMWE90FHh8yS1+KJAiWYh+iGWV1FquPjoO9VUHQ+VIhsCXNNyZ5Sf4++RVZBA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.21",
         "@vue/compiler-sfc": "3.5.21",

src/api/exportControl.js

@@ -4,7 +4,7 @@ import { ElMessage } from "element-plus";
 const request200 = requestP => {
 	return requestP.then(data => {
 		if (data.code === 200) {
-			console.log('返回的数据结构 =>', data.data)
+			console.log("返回的数据结构 =>", data.data);
 			return data.data;
 		}
 		ElMessage({
@@ -393,13 +393,13 @@ export function getDomainDistribution(sanctionDate = "2025-11-11") {
  * startTime: string
  * }[]>}
  */
-export function getEntitiesList(sanTypeId=1, pageNum = 1, pageSize = 10, sanctionDate = "", isCn = false) {
+export function getEntitiesList(sanTypeIds = ["1"], pageNum = 1, pageSize = 10, sanctionDate = "", isCn = false) {
 	return request200(
 		request({
 			method: "POST",
 			url: "/api/sanctionList/pageQuery",
 			data: {
-				sanTypeId,
+				sanTypeIds,
 				pageNum,
 				pageSize,
 				sanctionDate,

src/api/finance/index.js

@@ -128,3 +128,11 @@ export function getEntityTypeCount(params) {
 export function getRelateNews(sanRecordId) {
 	return http.get(`/api/sanctionList/invFin/getRelateNews?sanRecordId=${sanRecordId}`);
 }
+
+/**
+ * 制裁原因及相关历史制裁
+ * url：/sanctionList/invFin/getReasonAndSan
+ */
+export function getReasonAndSan(sanRecordId) {
+	return http.get(`/api/sanctionList/invFin/getReasonAndSan?sanRecordId=${sanRecordId}`);
+}

src/router/modules/exportControl.js

@@ -102,7 +102,7 @@ const exportControlRoutes = [
 		name: "singleSanction",
 		component: () => import("@/views/exportControl/v2.0SingleSanction/index.vue"),
 		meta: {
-			title: "单条制裁详情",
+			title: "单次制裁详情",
 			dynamicTitle: true
 		}
 	},

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

@@ -267,6 +267,7 @@ const resetModal = () => {
 };
 
 onMounted(() => {
+	console.log("出口管制-单次制裁");
 	getUrlParams();
 	getSingleSanctionOverviewData();
 });

src/views/finance/index.vue

@@ -1377,7 +1377,7 @@ watch(
 const fetchEntitiesList = async (page = 1, size = 10) => {
 	try {
 		console.log("activeResourceTabItem.value.id", activeResourceTabItem.value.id);
-		const res = await getEntitiesList(activeResourceTabItem.value.id.join(","), page, size);
+		const res = await getEntitiesList(activeResourceTabItem.value.id, page, size);
 		if (res) {
 			entitiesList.value = res.content.map(item => ({
 				...item,
@@ -1780,6 +1780,7 @@ onMounted(async () => {
 		// 获取出口管制制裁措施
 		await fetchSanctionList();
 	} catch (err) {
+		console.log("此处报错？");
 		console.log(err);
 	}
 	handleGetHylyList();

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

@@ -565,7 +565,7 @@ onMounted(async () => {
 		display: flex;
 		flex-direction: column;
 		gap: 16px;
-
+		display: none;
 		.tab-item {
 			cursor: pointer;
 			padding: 4px 20px;

src/views/finance/v2.0SingleSanction/components/impactAnalysis/index.vue

@@ -13,7 +13,7 @@
 			</div>
 		</div>
 		<industrial-impact v-if="activeIndex === 0"></industrial-impact>
-		<research-impact v-if="activeIndex === 1"></research-impact>
+		<!-- <research-impact v-if="activeIndex === 1"></research-impact> -->
 	</div>
 </template>
 
@@ -23,7 +23,8 @@ import { ref } from "vue";
 import industrialImpact from "./components/industrialImpact/index.vue";
 import researchImpact from "./components/researchImpact/index.vue";
 
-const activeTab = ref(["对华产业影响", "对华科研影响"]);
+// const activeTab = ref(["对华产业影响", "对华科研影响"]);
+const activeTab = ref(["对华产业影响"]);
 const activeIndex = ref(0);
 </script>
 
@@ -44,6 +45,7 @@ const activeIndex = ref(0);
 		display: flex;
 		flex-direction: column;
 		gap: 16px;
+		display: none;
 		.tab-item {
 			cursor: pointer;
 			padding: 4px 20px;

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

@@ -167,7 +167,7 @@
 									<el-table-column label="实体名称" min-width="280">
 										<template #default="scope">
 											<div class="name-cell">
-												<div class="dot"></div>
+												<!-- <div class="dot"></div> -->
 												<img :src="defaultTitle" class="company-icon" />
 												<span class="company-name" @click="handleCompClick(scope.row)">{{
 													scope.row.name
@@ -196,7 +196,22 @@
 									</el-table-column>
 									<el-table-column prop="location" label="上市地点" width="90" align="center" />
 									<el-table-column prop="date" label="制裁时间" width="150" align="center" />
-									<el-table-column prop="revenue" label="营收(亿元)" width="110" align="center" />
+									<el-table-column prop="entityTypeId" label="类型" width="120" align="center">
+										<template #default="scope">
+											<div style="display: flex; gap: 4px; justify-content: center">
+												<AreaTag
+													:tagName="
+														scope.row.entityType === 1
+															? '个人'
+															: scope.row.entityType === 2
+																? '实体'
+																: '公司'
+													"
+												/>
+											</div>
+										</template>
+									</el-table-column>
+									<!-- <el-table-column prop="revenue" label="营收(亿元)" width="110" align="center" /> -->
 									<el-table-column label="50%规则子企业" width="180" align="center">
 										<template #default="scope">
 											<span
@@ -218,6 +233,8 @@
 						</div>
 					</div>
 				</AnalysisBox>
+				<div :style="{ height: '20px' }"></div>
+				<AnalysisBox title="制裁原因及相关历史制裁" :showAllBtn="false"></AnalysisBox>
 			</div>
 		</div>
 		<!-- 50%规则子企业弹框 -->
@@ -1070,10 +1087,10 @@ onMounted(() => {
 
 						:deep(.el-table__header-wrapper) {
 							th {
-								background-color: var(--color-primary-100) !important;
+								// background-color: var(--color-primary-100) !important;
 								height: 48px;
 								padding: 0;
-								color: #fff;
+								color: rgb(34, 41, 52);
 								font-weight: 700;
 								font-size: 16px;
 								font-family: "Microsoft YaHei";
@@ -1134,7 +1151,7 @@ onMounted(() => {
 								font-size: 16px;
 								font-weight: 700;
 								line-height: 24px;
-								font-family: "Microsoft YaHei";
+								font-family: "Source Han Sans CN";
 								color: rgba(59, 65, 75, 1);
 								cursor: pointer;
 							}

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

@@ -273,15 +273,12 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
-* {
-	margin: 0;
-	padding: 0;
-}
 .entity-list {
 	width: 100%;
 	height: 100%;
 	overflow-y: auto;
-	padding-bottom: 50px;
+	padding-bottom: 10px;
+	background: #f7f8f9;
 	.header {
 		width: 100%;
 		height: 148px;