Merge branch 'master' of http://8.140.26.4:10003/caijian/risk-monitor into dev_hhq

src/api/coopRestriction/coopRestriction.js

+import request from "@/api/request.js";
+
+// 合作限制-首页统计接口
+export function getCoopRestrictionStatistics() {
+    return request({
+        method: 'GET',
+        url: `/api/cooperationlimitinfo/getCount`
+    })
+}
+
+// 合作限制-查询最新动态信息接口
+export function getCoopRestrictionTrends() {
+    return request({
+        method: 'GET',
+        url: `/api/cooperationlimitinfo/getLatestTrends`
+    })
+}
+
+// 合作限制-查询风险信号接口
+/**
+ * @param {moduleId} 
+ * @header token
+ */
+export function getCoopRestrictionSignals(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/riskSignal/${params.moduleId}`
+    })
+}
+
+// 合作限制-查询新闻资讯接口
+/**
+ * @param {moduleId} 
+ * @header token
+ */
+export function getCoopRestrictionNews(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/news/${params.moduleId}`
+    })
+}
+
+// 合作限制-查询社交媒体接口
+/**
+ * @param {moduleId} 
+ * @header token
+ */
+export function getCoopRestrictionSocial(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/social/${params.moduleId}`
+    })
+}
+
+// 合作限制-各类型合作限制政策对比接口
+/**
+ * @param {years} 
+ * @header token
+ */
+export function getCoopRestrictionCompare(params) {
+    return request({
+        method: 'GET',
+        url: `/api/cooperationlimitinfo/getLimitCompare`,
+        params
+    })
+}
+
+// 合作限制-各领域规则分布情况接口
+/**
+ * @param {year} 
+ * @header token
+ */
+export function getCoopRestrictionDomain(params) {
+    return request({
+        method: 'GET',
+        url: `/api/cooperationlimitinfo/getLimitArea`,
+        params
+    })
+}
\ No newline at end of file

src/views/bill/introdoction/STimeline.vue

@@ -56,7 +56,7 @@
         </defs> -->
 				<!-- 节点 -->
 				<circle
-					v-for="(node, idx) in nodes.slice(0, nodes.length)"
+					v-for="(node, idx) in nodes"
 					:key="'circle' + idx"
 					:cx="node.x"
 					:cy="node.y"
@@ -66,7 +66,7 @@
 					stroke-width="3"
 				/>
 				<line
-					v-for="(node, idx) in nodes.slice(0, nodes.length)"
+					v-for="(node, idx) in nodes"
 					:key="'line' + idx"
 					:x1="node.x"
 					:y1="node.y + 4"
@@ -170,9 +170,11 @@ export default {
 			return `${date.getFullYear()}年${date.getMonth() + 1}月`;
 		},
 		sortedDataList() {
-			if (!this.dataList) return [];
+			if (!this.dataList || !Array.isArray(this.dataList)) return [];
 			// Clone and sort by date ascending (Old -> New)
-			return [...this.dataList].sort((a, b) => new Date(a.actionDate) - new Date(b.actionDate));
+			return [...this.dataList]
+				.filter(item => item && item.actionDate)
+				.sort((a, b) => new Date(a.actionDate) - new Date(b.actionDate));
 		},
 		nodes() {
 			// 计算每个节点的坐标（蛇形）
@@ -180,7 +182,6 @@ export default {
 				const row = Math.floor(idx / this.maxPerRow);
 				const col = idx % this.maxPerRow;
 				let x, y;
-				// const leftMargin = 150; // 你可以自定义这个值
 
 				if (row % 2 === 0) {
 					x = this.leftMargin + col * this.nodeGapX + 50;
@@ -191,12 +192,17 @@ export default {
 				y = 60 + row * this.nodeGapY;
 
 				// Format Date: 2025-07-04 -> 7月4日
-				const dateObj = new Date(item.actionDate);
-				const formattedDate = `${dateObj.getMonth() + 1}月${dateObj.getDate()}日`;
+				let formattedDate = "";
+				if (item.actionDate) {
+					const dateObj = new Date(item.actionDate);
+					if (!isNaN(dateObj.getTime())) {
+						formattedDate = `${dateObj.getMonth() + 1}月${dateObj.getDate()}日`;
+					}
+				}
 
 				// Format Votes
-				let voteString = '';
-				if (item.agreeVote !== null && item.disagreeVote !== null) {
+				let voteString = "";
+				if (item.agreeVote !== null && item.agreeVote !== undefined && item.disagreeVote !== null && item.disagreeVote !== undefined) {
 					voteString = `${item.agreeVote}票赞成 : ${item.disagreeVote}票反对`;
 				}
 
@@ -238,7 +244,6 @@ export default {
 			for (let i = 1; i < this.nodes.length; i++) {
 				const prev = this.nodes[i - 1];
 				const curr = this.nodes[i];
-				console.log("prev", prev);
 
 				// 判断是否是行尾转折点
 				const isTurnPoint = i % this.maxPerRow === 0;
@@ -272,7 +277,8 @@ export default {
 		},
 		svgHeight() {
 			// SVG高度
-			return Math.ceil(this.dataList.length / this.maxPerRow) * this.nodeGapY + 40;
+			const listLength = (this.dataList && Array.isArray(this.dataList)) ? this.dataList.length : 0;
+			return Math.ceil(listLength / this.maxPerRow) * this.nodeGapY + 40;
 		}
 	}
 };

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

 <template>
 	<div class="data-new">
 		<div class="left">
-			<img src="./assets/leftbtn.png" alt="" class="left-btn" />
-			<img src="./assets/rightbtn.png" alt="" class="right-btn" />
+			<img src="./assets/leftbtn.png" alt="" class="left-btn" @click="handlePrev" />
+			<img src="./assets/rightbtn.png" alt="" class="right-btn" @click="handleNext" />
 			<div class="left-top">
 				<img src="./assets/icon01.png" alt="" />
 				<div class="left-top-title">合作限制动态</div>
 				<div class="more" @click="handleClickToDetail">查看详情 ></div>
 			</div>
-			<div class="left-center">
-				<img src="./assets/usImg.png" alt="" />
-				<div class="left-center-main">
-					<div class="left-center-main-title">保护美国资金与专业知识免受敌对研究利用法案</div>
-					<div class="left-center-main-ul">
-						<ul>
-							<li>
-								<span class="ul-title">数据来源：</span>
-								<span class="ul-content">美国国会</span>
-							</li>
-							<li>
-								<span class="ul-title">合作限制类型：</span>
-								<span class="ul-content">科研合作限制</span>
-							</li>
-							<li>
-								<span class="ul-title">发布日期：</span>
-								<span class="ul-content">2025年10月7日</span>
-							</li>
-							<li>
-								<span class="ul-title">涉及领域</span>
-								<span class="ul-pie cl1">航空航天</span>
-								<span class="ul-pie cl2">人工智能</span>
-								<span class="ul-pie cl3">集成电路</span>
-							</li>
-						</ul>
+			
+			<el-carousel
+				ref="carouselRef"
+				height="412px"
+				direction="horizontal"
+				:autoplay="true"
+				:interval="5000"
+				arrow="never"
+				indicator-position="none"
+				@change="handleCarouselChange"
+			>
+				<el-carousel-item v-for="(item, index) in coopRestrictionTrends" :key="item.ID || index">
+					<div class="carousel-item-content">
+						<div class="left-center">
+							<img :src="item.IMAGEURL || defaultImg" alt="" />
+							<div class="left-center-main">
+								<div class="left-center-main-title">{{ item.LIMITNAME || "暂无动态" }}</div>
+								<div class="left-center-main-ul">
+									<ul>
+										<li>
+											<span class="ul-title">数据来源：</span>
+											<span class="ul-content">{{ item.ORGNAME || "未知" }}</span>
+										</li>
+										<li>
+											<span class="ul-title">合作限制类型：</span>
+											<span class="ul-content">{{ item.LIMITTYPE || "未知" }}</span>
+										</li>
+										<li>
+											<span class="ul-title">发布日期：</span>
+											<span class="ul-content">{{ item.LIMITDATE || "未知" }}</span>
+										</li>
+										<li>
+											<span class="ul-title">涉及领域：</span>
+											<div class="ul-tags" v-if="item.AREA">
+												<span 
+													v-for="(field, fIndex) in (typeof item.AREA === 'string' ? item.AREA.split(',') : item.AREA)" 
+													:key="fIndex"
+													class="ul-pie"
+													:class="'cl' + ((fIndex % 3) + 1)"
+												>
+													{{ field }}
+												</span>
+											</div>
+											<span v-else class="ul-content">未知</span>
+										</li>
+									</ul>
+								</div>
+							</div>
+							<!-- <div class="left-center-title">{{ item.LIMITTYPE }}</div> -->
+						</div>
+						<div class="left-bottom">
+							<ul>
+								<li class="left-bottom-li">内容摘要：</li>
+							</ul>
+							<div class="left-bottom-content">
+								{{ item.INTRODUCTION || "暂无内容摘要" }}
+							</div>
+						</div>
 					</div>
-				</div>
-				<div class="left-center-title">国会法案</div>
-			</div>
-			<div class="left-bottom">
-				<ul>
-					<li class="left-bottom-li">内容摘要：</li>
-				</ul>
-				<div class="left-bottom-content">
-					该法案已被纳入《国防授权法案》（NDAA）的讨论范畴，并已在参议院通过审议
-					。该法案规定，将禁止任何与中国等被视为“敌对国”有合作关系的科学家获得联邦资助
-					。其限制范围极其宽泛，从联合研究、合著论文到指导研究生或博士后几乎全覆盖
-					。更严厉的是，该条款具有追溯效力，可追溯至过去5年的合作。
-				</div>
-			</div>
+				</el-carousel-item>
+				
+				<!-- 无数据时的占位展示 -->
+				<el-carousel-item v-if="coopRestrictionTrends.length === 0">
+					<div class="carousel-item-content">
+						<div class="left-center">
+							<img :src="defaultImg" alt="" />
+							<div class="left-center-main">
+								<div class="left-center-main-title">暂无合作限制动态</div>
+								<div class="left-center-main-ul">
+									<ul>
+										<li><span class="ul-title">数据来源：</span><span class="ul-content">未知</span></li>
+										<li><span class="ul-title">合作限制类型：</span><span class="ul-content">未知</span></li>
+										<li><span class="ul-title">发布日期：</span><span class="ul-content">未知</span></li>
+										<li><span class="ul-title">涉及领域</span><span class="ul-content">未知</span></li>
+									</ul>
+								</div>
+							</div>
+						</div>
+					</div>
+				</el-carousel-item>
+			</el-carousel>
 		</div>
 		<div class="right">
 			<div class="right-top">
 				<img src="./assets/icon02.png" alt="" />
 				<div class="right-top-title">
 					风险信号
-					<span>4</span>
+					<span>{{ riskSignals.length }}</span>
 				</div>
 			</div>
 			<div style="margin: 6px 34px 0 23px">
-				<div v-for="item in list" :key="item.id" class="right-main"	@click="handleClickToDetail()">
+				<div v-for="item in riskSignals" :key="item.id" class="right-main"	@click="handleToRiskDetail">
 					<div class="main-left" :class="{ cl4: item.title === '特别重大', cl5: item.title === '重大风险' }">
 						{{ item.title }}
 					</div>
@@ -75,10 +116,52 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref, onMounted, computed } from "vue";
 import router from "@/router";
+import { getCoopRestrictionTrends } from "@/api/coopRestriction/coopRestriction.js";
+import defaultImg from "./assets/usImg.png";
+
+const coopRestrictionTrends = ref([]);
+const carouselRef = ref(null);
+const activeIndex = ref(0);
+
+// 获取合作限制-最新动态数据
+const getCoopRestrictionTrendsData = async () => {
+	try {
+		const res = await getCoopRestrictionTrends();
+		if (res && res.code === 200) {
+			coopRestrictionTrends.value = res.data || [];
+		}
+	} catch (error) {
+		console.error("获取合作限制最新动态数据失败:", error);
+	} 
+};
+
+// 轮播图手动切换
+const handlePrev = () => {
+	if (carouselRef.value) {
+		carouselRef.value.prev();
+	}
+};
+const handleNext = () => {
+	if (carouselRef.value) {
+		carouselRef.value.next();
+	}
+};
+
+// 轮播切换回调
+const handleCarouselChange = (index) => {
+	activeIndex.value = index;
+};
+
+// 左侧展示的主动态
+const mainTrend = computed(() => {
+	if (coopRestrictionTrends.value.length === 0) return null;
+	return coopRestrictionTrends.value[activeIndex.value] || coopRestrictionTrends.value[0];
+});
 
-const list = ref([
+// 右侧风险信号列表 
+const riskSignals = ref([
 	{
 		id: 1,
 		title: "特别重大",
@@ -106,8 +189,19 @@ const list = ref([
 ]);
 
 // 点击查看详情
-const handleClickToDetail = () => {
-	// router.push("/decreeLayout");
+const handleClickToDetail = (item) => {
+	const activeItem = (item && item.ID) ? item : mainTrend.value;
+	const id = activeItem?.ID;
+	if (!id) return;
+	const curRoute = router.resolve({
+		path: "/cooperationRestrictions/detail",
+		query: { id: id },
+	});
+	window.open(curRoute.href, "_blank");
+};
+
+// 点击风险信号详情
+const handleToRiskDetail = () => {
 	const curRoute = router.resolve("/cooperationRestrictions/detail");
 	window.open(curRoute.href, "_blank");
 };
@@ -118,6 +212,10 @@ const handleToMoreRiskSignal = () => {
 	window.open(route.href, "_blank");
 };
 
+onMounted(() => {
+	// 合作限制-最新动态数据-获取数据
+    getCoopRestrictionTrendsData();
+});
 </script>
 
 <style scoped lang="scss">
@@ -146,6 +244,8 @@ const handleToMoreRiskSignal = () => {
 			top: 223px;
 			left: 0px;
 			cursor: pointer;
+			z-index: 100;
+			pointer-events: auto;
 		}
 		.right-btn {
 			width: 24px;
@@ -154,6 +254,8 @@ const handleToMoreRiskSignal = () => {
 			top: 223px;
 			right: 0px;
 			cursor: pointer;
+			z-index: 100;
+			pointer-events: auto;
 		}
 		.left-top {
 			width: 100%;
@@ -178,6 +280,7 @@ const handleToMoreRiskSignal = () => {
 				right: 40px;
 				color: rgb(5, 95, 194);
 				cursor: pointer;
+				z-index: 101;
 			}
 			.left-top-title {
 				margin-left: 60px;
@@ -193,6 +296,10 @@ const handleToMoreRiskSignal = () => {
 				padding: 11px 16px;
 			}
 		}
+		.carousel-item-content {
+			width: 100%;
+			height: 100%;
+		}
 		.left-center {
 			width: 967px;
 			height: 208px;
@@ -224,12 +331,13 @@ const handleToMoreRiskSignal = () => {
 						list-style-position: inside;
 						li {
 							width: 100%;
-							height: 24px;
+							min-height: 24px;
 							margin-bottom: 12px;
+							display: flex;
+							align-items: flex-start;
 							.ul-title {
-								display: inline-block;
+								flex-shrink: 0;
 								width: 120px;
-								height: 24px;
 								font-size: 16px;
 								font-weight: 700;
 								font-family: "Microsoft YaHei";
@@ -237,19 +345,28 @@ const handleToMoreRiskSignal = () => {
 								color: rgb(59, 65, 75);
 							}
 							.ul-content {
+								flex: 1;
 								color: rgb(59, 65, 75);
 								font-family: "Microsoft YaHei";
 								font-size: 16px;
 								font-weight: 400;
 								line-height: 24px;
 							}
+							.ul-tags {
+								flex: 1;
+								display: flex;
+								flex-wrap: wrap;
+								gap: 8px;
+							}
 							.ul-pie {
 								display: inline-block;
 								box-sizing: border-box;
 								padding: 2px 8px;
 								border: 1px solid;
 								border-radius: 4px;
-								margin-right: 8px;
+								font-size: 14px;
+								line-height: 18px;
+								white-space: nowrap;
 							}
 							.cl1 {
 								border-color: rgba(186, 224, 255, 1);

src/views/coopRestriction/components/dataSub/index.vue

@@ -4,7 +4,7 @@
 			<div class="left-title">
 				<img src="./assets/icon01.png" alt="" />
 				<div class="tit">各类型合作限制政策对比</div>
-				<el-select v-model="value" placeholder="Select" class="select">
+				<el-select v-model="value" placeholder="Select" class="select" @change="getCoopRestrictionCompareData">
 					<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
 				</el-select>
 			</div>
@@ -16,7 +16,7 @@
 			<div class="right-title">
 				<img src="./assets/icon02.png" alt="" />
 				<div class="tit">各领域规则分布情况</div>
-                <el-select v-model="value1" placeholder="Select" class="select">
+                <el-select v-model="value1" placeholder="Select" class="select" @change="getCoopRestrictionDomainData">
 					<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value" />
 				</el-select>
 			</div>
@@ -30,28 +30,120 @@
 <script setup>
 import { ref, onMounted, onBeforeUnmount } from "vue";
 import * as echarts from "echarts";
+import { getCoopRestrictionCompare, getCoopRestrictionDomain } from "@/api/coopRestriction/coopRestriction";
 
-const value = ref("近十年");
-const value1 = ref("2025年");
+// 合作限制-各领域规则分布情况接口
+const coopRestrictionDomain = ref([]);
+const getCoopRestrictionDomainData = async () => {
+	try {
+		const res = await getCoopRestrictionDomain({
+			year: value1.value
+		});
+		if (res && res.code === 200) {
+			coopRestrictionDomain.value = res.data || [];
+		}
+	} catch (error) {
+		console.error("获取合作限制各领域规则分布情况数据失败:", error);
+	} 
+};
+
+
+// 合作限制-各类型合作限制政策对比接口
+const coopRestrictionCompare = ref([]);
+const getCoopRestrictionCompareData = async () => {
+	try {
+		const res = await getCoopRestrictionCompare({
+			years: value.value
+		});
+		if (res && res.code === 200) {
+			coopRestrictionCompare.value = res.data || [];
+		}
+	} catch (error) {
+		console.error("获取合作限制各类型合作限制政策对比数据失败:", error);
+	} 
+};
+
+const value = ref(10);
+const value1 = ref("2026");
 const options = [
-	{
-		value: "近十年",
-		label: "近十年"
-	},
-	{
-		value: "近五年",
-		label: "近五年"
-	}
+	{ value: 1, label: "近一年" },
+	{ value: 2, label: "近两年" },
+	{ value: 3, label: "近三年" },
+	{ value: 4, label: "近四年" },
+	{ value: 5, label: "近五年" },
+	{ value: 10, label: "近十年" },
+	{ value: 15, label: "近十五年" },
+	{ value: 20, label: "近二十年" }
 ];
 const options1 = [
+    {
+        value: "2026",
+        label: "2026年"
+    },
 	{
-		value: "2025年",
+		value: "2025",
 		label: "2025年"
 	},
 	{
-		value: "2024年",
+		value: "2024",
 		label: "2024年"
-	}
+	},
+    {
+        value: "2023",
+        label: "2023年"
+    },
+    {
+        value: "2022",
+        label: "2022年"
+    },
+    {
+        value: "2021",
+        label: "2021年"
+    },
+    {
+        value: "2020",
+        label: "2020年"
+    },
+    {
+        value: "2019",
+        label: "2019年"
+    },
+    {
+        value: "2018",
+        label: "2018年"
+    },
+    {
+        value: "2017",
+        label: "2017年"
+    },
+    {
+        value: "2016",
+        label: "2016年"
+    },
+    {
+        value: "2015",
+        label: "2015年"
+    },
+    {
+        value: "2014",
+        label: "2014年"
+    },
+    {
+        value: "2013",
+        label: "2013年"
+    },
+    {
+        value: "2012",
+        label: "2012年"
+    },
+    {
+        value: "2011",
+        label: "2011年"
+    },
+    {
+        value: "2010",
+        label: "2010年"
+    }
 ];
 
 const leftChartRef = ref(null);
@@ -214,7 +306,14 @@ const initRightChart = () => {
     rightChart.setOption(option);
 };
 
-onMounted(() => { initLeftChart(); initRightChart(); });
+onMounted(() => { 
+    // 合作限制-各类型合作限制政策对比接口
+    getCoopRestrictionCompareData();
+    // 合作限制-各领域规则分布情况接口
+    getCoopRestrictionDomainData();
+    initLeftChart();
+    initRightChart();
+});
 onBeforeUnmount(() => { window.removeEventListener("resize", handleResize); if (leftChart) { leftChart.dispose(); leftChart = null; } if (rightChart) { rightChart.dispose(); rightChart = null; } });
 </script>
 
@@ -259,7 +358,7 @@ onBeforeUnmount(() => { window.removeEventListener("resize", handleResize); if (
 				color: rgb(5, 95, 194);
 			}
             .select {
-                width: 120px;
+                width: 150px;
                 height: 28px;
                 padding: 0px 12px;
                 position: absolute;
@@ -307,7 +406,7 @@ onBeforeUnmount(() => { window.removeEventListener("resize", handleResize); if (
 				color: rgb(5, 95, 194);
 			}
             .select {
-                width: 120px;
+                width: 150px;
                 height: 28px;
                 padding: 0px 12px;
                 position: absolute;

src/views/coopRestriction/index.vue

@@ -95,7 +95,7 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
 import { useRouter } from "vue-router";
 import comTitle from "./common/comTitle.vue";
 import newData from "./components/dataNew/index.vue";