合并分支 'ls_dev' 到 'master'

src/api/allUnion.js

+import request from "@/api/request.js";
+
+// 全联盟-获取联盟列表
+/**
+ * @header token
+ */
+export function getAllUnionList() {
+  return request({
+    method: 'GET',
+    url: `/api/union/union/unionList`
+  })
+}
+
+// 全联盟-获取排华数量
+/**
+ * @header token
+ */
+export function getUnionCount() {
+  return request({
+    method: 'GET',
+    url: `/api/union/union/unionCount`
+  })
+}
+
+// 全联盟-获取排华联盟动态
+/**
+ * @header token
+ */
+export function getDynamic() {
+  return request({
+    method: 'GET',
+    url: `/api/union/union/dynamic`
+  })
+}
+
+// 全联盟-获取排华联盟预警
+/**
+ * @param {Object} params
+ * @param {Integer} params.id - 上一接口查询的EccnCategoryID
+ * @header token
+ */
+export function getPrediction() {
+  return request({
+    method: 'GET',
+    url: `/api/union/union/prediction`
+  })
+}
+
+// 全联盟-获取排华联盟领域分布
+/**
+ * @param {Object} params
+ * @param {Integer} params.id - 上一接口查询的EccnCategoryID
+ * @header token
+ */
+export function getIndustry() {
+  return request({
+    method: 'GET',
+    url: `/api/union/union/industry`
+  })
+}
+
+// 全联盟-获取排华联盟国家紧密度
+/**
+ * @param {Object} params
+ * @param {Integer} params.id - 上一接口查询的EccnCategoryID
+ * @header token
+ */
+export function getCountryRelation() {
+  return request({
+    method: 'GET',
+    url: `/api/union/union/countryRelation`
+  })
+}
\ No newline at end of file

src/views/ruleRestriction/components/askPage/index.vue

@@ -4,7 +4,7 @@
 			<div class="left-title">
 				<img src="./assets/icon01.png" alt />
 				<div class="tit">新闻资讯</div>
-				<div class="more" @click="handleToMoreNews">更多 +</div>
+				<div class="more" @click="handleToNewsDetail">更多 +</div>
 			</div>
 			<div class="left-main">
 				<div v-for="item in leftList" :key="item.newsId" class="main-item">
@@ -29,6 +29,7 @@
 			<div class="right-title">
 				<img src="./assets/icon02.png" alt />
 				<div class="tit">社交媒体</div>
+				<div class="more" @click="handleToSocialDetail">更多 +</div>
 			</div>
 			<div class="right-main">
 				<div class="trump" v-for="item in rightList">

src/views/ruleRestriction/components/dataNew/index.vue

@@ -160,12 +160,12 @@ const getRiskSignalInfo = async () => {
   }
 }
 
-// // 跳转详情
-// const handleClickToDetail = () => {
-//   // router.push("/decreeLayout");
-//   // const route = router.resolve("");
-//   window.open(`/ruleRestrictions/detail?id=${latestUpdateList.value[latestUpdateIndex.value].RULEID}`, "_blank");
-// };
+// 跳转详情
+const handleClickToDetail = () => {
+  // router.push("/decreeLayout");
+  // const route = router.resolve("");
+  window.open(`/ruleRestrictions/detail?id=${latestUpdateList.value[latestUpdateIndex.value].RULEID}`, "_blank");
+};
 
 // 左侧展示的主动态
 const mainTrend = computed(() => {
@@ -183,18 +183,18 @@ const handleToRiskDetail = (item) => {
 };
 
 // 点击查看详情
-const handleClickToDetail = item => {
-	const activeItem = item && item.RULEID ? item : mainTrend.value;
-	const id = activeItem?.RULEID;
-	if (!id) return;
-	window.sessionStorage.setItem("curTabName", activeItem?.RULENAMEZH);
+// const handleClickToDetail = item => {
+// 	const activeItem = item && item.RULEID ? item : mainTrend.value;
+// 	const id = activeItem?.RULEID;
+// 	if (!id) return;
+// 	window.sessionStorage.setItem("curTabName", activeItem?.RULENAMEZH);
 
-	const curRoute = router.resolve({
-		path: "/ruleRestrictions/detail",
-		query: { id: id }
-	});
-	window.open(curRoute.href, "_blank");
-};
+// 	const curRoute = router.resolve({
+// 		path: "/ruleRestrictions/detail",
+// 		query: { id: id }
+// 	});
+// 	window.open(curRoute.href, "_blank");
+// };
 
 // 查看更多动态
 const handleToMoreRiskSignal = () => {

src/views/ruleRestriction/detail/index.vue

@@ -2,17 +2,21 @@
 	<div class="cooperation-restrictions-detail">
 		<div class="nav">
 			<div class="nav-main">
-				<img src="./assets/image01.png" alt />
-				<div class="content">
-					<div class="cl1">美国联邦通信委员会（FCC）启动程序撤销对 TUV/宁波的认可</div>
-					<div class="cl2">FCC Begins Proceedings to Withdraw Recognition of TUV/Ningbo</div>
-					<div class="cl3">2025年10月24日 10:33 · 美国联邦通信委员会</div>
+				<div style="display: flex; align-items: center">
+					<img src="./assets/image01.png" alt />
+					<div class="content">
+						<div class="cl1">{{ overviewInfo.RULENAMEZH }}</div>
+						<div class="cl2">{{ overviewInfo.RULENAME || '暂无' }}</div>
+						<div class="cl3">{{ getTime(overviewInfo.PUBLISHDATE) }} · {{ overviewInfo.ORGNAME }}</div>
+					</div>
 				</div>
 				<div class="btn">
 					<button class="btn1">
 						<img src="./assets/icon01.png" alt />查看原文
 					</button>
-					<!-- <button class="btn1"><img src="./assets/icon02.png" alt="" />查看官网</button> -->
+					<button class="btn1">
+						<img src="./assets/icon02.png" alt />查看官网
+					</button>
 					<button class="btn1 active">
 						<img src="./assets/icon03.png" alt />分析报告
 					</button>
@@ -20,8 +24,8 @@
 			</div>
 		</div>
 		<div class="title">
-			<span class="title-one">当前合作限制数据已关联至行政令：</span>
-			<span class="title-two">《美国联邦通信委员会（FCC）启动程序撤销对 TUV/宁波的认可》2025年10月24日</span>
+			<span class="title-one">当前规则限制数据已关联至{{ overviewInfo.Relation[0].TYPE }}：</span>
+			<span class="title-two">{{ overviewInfo.Relation[0].RELATIONNAME }} &nbsp;{{ overviewInfo.Relation[0].RELATIONDATE }}</span>
 			<img src="./assets/right.png" alt />
 		</div>
 		<div class="main">
@@ -33,27 +37,24 @@
 					<img class="img2" src="./assets/下载按钮.png" alt />
 					<img class="img3" src="./assets/收藏按钮.png" alt />
 					<div class="left-top-content">
-						<span>
-							美国联邦通信委员会（FCC）启动程序撤销对德国莱茵 TÜV
-							集团/中国检验认证集团（宁波）有限公司作为测试认可实验室的认证。
-						</span>
+						<span>{{ overviewInfo.RULENAMEZH }}</span>
 					</div>
 					<div class="left-top-bottom">
 						<div>
 							<span class="tit">限制时间：</span>
-							<span class="tit1">2025年10月24日</span>
+							<span class="tit1">{{ getTime(overviewInfo.PUBLISHDATE) }}</span>
 						</div>
 						<div>
 							<span class="tit">限制机构：</span>
-							<span class="tit1 tit2">美国联邦通信委员会（FCC） ></span>
+							<span class="tit1 tit2">{{ overviewInfo.ORGNAME }}</span>
 						</div>
 						<div>
 							<span class="tit">限制手段：</span>
-							<span class="tit1">行政令</span>
+							<span class="tit1">{{ overviewInfo.RULEMEANS }}</span>
 						</div>
 						<div>
 							<span class="tit">限制领域：</span>
-							<span class="tit3">集成电路</span>
+							<span class="tit3" v-for="ele in overviewInfo.Area">{{ ele }}</span>
 						</div>
 					</div>
 				</div>
@@ -177,6 +178,7 @@ import swb from "./assets/商务部.png";
 import bg from "./assets/白宫.png";
 import czb from "./assets/财政部.png";
 import gh from "./assets/国会.png";
+import { getSanctionOverview } from '@/api/ruleRestriction/index.js'
 
 const dataList = ref([
   {
@@ -281,15 +283,35 @@ const dataList3 = ref([
 ]);
 
 const overviewInfo = ref({})
+const sanRecordId = ref('')
 
+const getUrlParams = () => {
+  const urlParams = new URLSearchParams(window.location.search);
+  sanRecordId.value = urlParams.get("id") || ""
+}
 
-// const getUrlParams = () => {
-//   const urlParams = new URLSearchParams(window.location.search);
-//   sanRecordId.value = urlParams.get("id") || ""
-// }
+const getSanctionOverviewInfo = async () => {
+  try {
+    const res = await getSanctionOverview(sanRecordId.value);
+    console.log('------getSanctionOverviewInfo res', res)
+    if (res && res.code === 200) {
+      console.log('----getSanctionOverviewInfo', res.data)
+      overviewInfo.value = res.data
+    }
+  } catch (error) {
+    console.error("获取最新动态接口失败:", error);
+  }
+}
 
-  onMounted(() => {
-  // getUrlParams()
+const getTime = (time) => {
+  if (time) {
+    const array = time.split('-')
+    return `${array[0]}年${array[1]}月${array[2]}日`
+  }
+}
+onMounted(() => {
+  getUrlParams()
+  getSanctionOverviewInfo()
 })
 </script>
 
@@ -319,15 +341,16 @@ const overviewInfo = ref({})
 			margin: 0 auto;
 			display: flex;
 			align-items: center;
+			justify-content: space-between;
 			img {
 				width: 72px;
 				height: 72px;
 				margin-right: 16px;
 			}
 			.content {
-				width: 758px;
+				// width: 758px;
 				height: 81px;
-				margin-right: 378px;
+				// margin-right: 378px;
 				.cl1 {
 					font-size: 24px;
 					font-weight: 700;
@@ -524,6 +547,7 @@ const overviewInfo = ref({})
 						.tit3 {
 							display: inline-block;
 							border-radius: 4px;
+              margin-right: 8px;
 							background-color: rgba(255, 241, 240, 1);
 							border: 1px solid rgba(255, 163, 158, 1);
 							color: rgba(245, 34, 45, 1);