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

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

@@ -5,7 +5,7 @@
 			<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="left-top-title">?/div>
 				<div class="more" @click="handleClickToDetail">祕 ></div>
 			</div>
 
@@ -16,23 +16,23 @@
 						<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-title">{{ item.LIMITNAME || "? }}</div>
 								<div class="left-center-main-ul">
 									<ul>
 										<li>
-											<span class="ul-title">数据来源：</span>
+											<span class="ul-title">皞?/span>
 											<span class="ul-content">{{ item.ORGNAME || "" }}</span>
 										</li>
 										<li>
-											<span class="ul-title">合作限制类型：</span>
+											<span class="ul-title">蝐餃?/span>
 											<span class="ul-content">{{ item.LIMITTYPE || "" }}</span>
 										</li>
 										<li>
-											<span class="ul-title">发布日期：</span>
+											<span class="ul-title">?/span>
 											<span class="ul-content">{{ item.LIMITDATE || "" }}</span>
 										</li>
 										<li>
-											<span class="ul-title">涉及领域：</span>
+											<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(',')
@@ -49,7 +49,7 @@
 						</div>
 						<div class="left-bottom">
 							<ul>
-								<li class="left-bottom-li">内容摘要：</li>
+								<li class="left-bottom-li">捆?/li>
 							</ul>
 							<div class="left-bottom-content">
 								{{ item.INTRODUCTION || "捆" }}
@@ -58,18 +58,18 @@
 					</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-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>
+										<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>
@@ -90,7 +90,7 @@
 			<div style="margin: 6px 34px 0 23px">
 				<div v-for="item in riskSignals" :key="item.id" class="right-main" @click="handleToRiskDetail(item)">
 					<div class="main-left"
-						:class="{ cl4: item.title === '特别重大', cl5: item.title === '重大风险', cl6: item.title === '一般风险' }">
+						:class="{ cl4: item.title === '之', cl5: item.title === '之憌', cl6: item.title === '銝憌? }">
 						{{ item.title }}
 					</div>
 					<div class="item-right">
@@ -114,7 +114,7 @@
 </template>
 
 <script setup>
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { ref, onMounted, computed } from "vue";
 import router from "@/router";
 import { getCoopRestrictionTrends, getCoopRestrictionSignals } from "@/api/coopRestriction/coopRestriction.js";
@@ -144,7 +144,7 @@ const coopRestrictionTrends = ref([]);
 const carouselRef = ref(null);
 const activeIndex = ref(0);
 
-// 获取合作限制-最新动态数据
+// -?
 const getCoopRestrictionTrendsData = async () => {
 	try {
 		const res = await getCoopRestrictionTrends();
@@ -152,11 +152,11 @@ const getCoopRestrictionTrendsData = async () => {
 			coopRestrictionTrends.value = res.data || [];
 		}
 	} catch (error) {
-		console.error("获取合作限制最新动态数据失败:", error);
+		console.error("憭梯?", error);
 	}
 };
 
-// 轮播图手动切换
+// 頧格?
 const handlePrev = () => {
 	if (carouselRef.value) {
 		carouselRef.value.prev();
@@ -173,7 +173,7 @@ const handleCarouselChange = index => {
 	activeIndex.value = index;
 };
 
-// 左侧展示的主动态
+// 撌虫儒撅內蜓?
 const mainTrend = computed(() => {
 	if (coopRestrictionTrends.value.length === 0) return null;
 	return coopRestrictionTrends.value[activeIndex.value] || coopRestrictionTrends.value[0];
@@ -212,7 +212,7 @@ const handleToMoreRiskSignal = () => {
 };
 
 onMounted(() => {
-	// 合作限制-最新动态数据-获取数据
+	// -?
 	getCoopRestrictionTrendsData();
 	// -憌靽∪-
 	getCoopRestrictionSignalsData();

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

@@ -5,7 +5,7 @@
 			<img src="./assets/rightbtn.png" alt class="right-btn" @click="changeIndex(1)" />
 			<div class="left-top">
 				<img src="./assets/icon01.png" alt />
-				<div class="left-top-title">规则限制动态</div>
+				<div class="left-top-title">閫?/div>
 				<div class="more" @click="handleClickToDetail">祕 ></div>
 			</div>
 			<div class="left-center">
@@ -15,22 +15,22 @@
 					<div class="left-center-main-ul">
 						<ul>
 							<li>
-								<span class="ul-title">发布机构：</span>
+								<span class="ul-title">?/span>
 								<span class="ul-content">{{ latestUpdateList[latestUpdateIndex].PUBLISHORGNAME }}</span>
 							</li>
 							<li>
-								<span class="ul-title">发布日期：</span>
+								<span class="ul-title">?/span>
 								<span class="ul-content">{{ latestUpdateList[latestUpdateIndex].PUBLISHDATE }}</span>
 							</li>
 							<li>
-								<span class="ul-title">涉及领域：</span>
+								<span class="ul-title">瘨?/span>
 								<span class="ul-pie cl1" v-for="item in latestUpdateList[latestUpdateIndex].ruleAreas">{{ item }}</span>
 								<!-- <span class="ul-pie cl2">頝</span>
-								<span class="ul-pie cl3">新材料</span>
+								<span class="ul-pie cl3">?/span>
 								<span class="ul-pie cl4">蝘</span>-->
 							</li>
 							<li>
-								<span class="ul-title">限制实体：</span>
+								<span class="ul-title">摰?/span>
 								<span class="ul-content" v-for="item in latestUpdateList[latestUpdateIndex].ruleEntities">{{
 									item.ORGNAME }} &nbsp;</span>
 							</li>
@@ -41,7 +41,7 @@
 			</div>
 			<div class="left-bottom">
 				<ul>
-					<li class="left-bottom-li">内容摘要：</li>
+					<li class="left-bottom-li">捆?/li>
 				</ul>
 				<div class="left-bottom-content">{{ latestUpdateList[latestUpdateIndex].RULEINTRODUCTION }}</div>
 			</div>
@@ -58,7 +58,7 @@
 				<div v-for="(item, index) in list" :key="index" class="right-main">
 					<div
 						class="main-left"
-						:class="{ cl4: item.signalLevel === '特别重大', cl5: item.signalLevel === '重大风险', cl6: item.signalLevel === '一般风险'}"
+						:class="{ cl4: item.signalLevel === '之', cl5: item.signalLevel === '之憌', cl6: item.signalLevel === '銝憌?}"
 					>{{ item.signalLevel }}</div>
 					<div class="main-center">{{ item.signalTitle }}</div>
 					<div class="main-right">{{ item.signalTime }}</div>
@@ -75,7 +75,7 @@
 </template>
 
 <script setup>
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { ref, onBeforeMount, computed } from "vue";
 import router from "@/router";
 import { getLatestUpdates, getRiskSignal } from '@/api/ruleRestriction/index.js'
@@ -84,7 +84,7 @@ const list = ref([
 	{
 		id: 1,
 		title: "之",
-		content: "保护美国资金与专业知识免受敌对研究利用法案",
+		content: "靽蝢韏霂笆弦瘜?,
 		time: "銝憭拙"
 	},
 	{
@@ -96,7 +96,7 @@ const list = ref([
 	{
 		id: 3,
 		title: "之憌",
-		content: "众议院“美中战略竞争特别委员会”向国会提...",
+		content: "隡悅葉蝡憪隡?..",
 		time: "銝憭拙"
 	},
 	{
@@ -107,7 +107,7 @@ const list = ref([
 	}
 ]);
 
-// 最新动态列表
+// ?
 const latestUpdateList = ref([{}])
 // 敶蝷箸
 const latestUpdateIndex = ref(0)
@@ -115,14 +115,14 @@ const latestUpdateIndex = ref(0)
 // 
 const changeIndex = (num) => {
 	if (num === -1) {
-		// 判断当前是否是第一个，是的话则将序号设置为最后一个
+		// 敶蝚砌銝迎霈曄蔭銝箸銝?
 		if (latestUpdateIndex.value === 0) {
 			latestUpdateIndex.value = latestUpdateList.value.length - 1
 		} else {
 			latestUpdateIndex.value--
 		}
 	} else {
-		// 判断当前是否是最后一个，是的话则将序号设置为第一个
+		// 敶銝迎霈曄蔭銝箇洵銝銝?
 		if (latestUpdateIndex.value === latestUpdateList.value.length - 1) {
 			latestUpdateIndex.value = 0
 		} else {
@@ -141,7 +141,7 @@ const getLatestUpdateInfo = async () => {
 			latestUpdateList.value = res.data
 		}
 	} catch (error) {
-		console.error("获取最新动态接口失败:", error);
+		console.error("憭梯?", error);
 	}
 }
 
@@ -165,7 +165,7 @@ const handleClickToDetail = () => {
 	window.open(`/ruleRestrictions/detail?id=${latestUpdateList.value[latestUpdateIndex.value].RULEID}`, "_blank");
 };
 
-// 左侧展示的主动态
+// 撌虫儒撅內蜓?
 const mainTrend = computed(() => {
 	if (riskSignalList.value.length === 0) return null;
 	return riskSignalList.value[activeIndex.value] || riskSignalList.value[0];
@@ -194,7 +194,7 @@ const handleToRiskDetail = (item) => {
 // 	window.open(curRoute.href, "_blank");
 // };
 
-// 查看更多动态
+// 憭?
 const handleToMoreRiskSignal = () => {
 	const route = router.resolve("/viewRiskSignal");
 	window.open(route.href, "_blank");

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

@@ -5,7 +5,7 @@
 			<img src="./assets/rightbtn.png" alt="" class="right-btn" @click="handleSwithCurDecree('right')" />
 			<div class="left-top">
 				<img src="./assets/icon01.png" alt="" />
-				<div class="left-top-title">最新资助项目</div>
+				<div class="left-top-title">韏憿寧?/div>
 				<span>祕 ></span>
 			</div>
 			<el-carousel ref="carouselRef" height="395px" :autoplay="true" :interval="3000" arrow="never"
@@ -21,24 +21,24 @@
 							<div class="left-center-main-ul">
 								<ul>
 									<li>
-										<span class="ul-title">投资主体：</span>
-										<span class="ul-content">美国国家科学基金会</span>
+										<span class="ul-title">蜓雿?/span>
+										<span class="ul-content">蝢摰嗥郎?/span>
 									</li>
 									<li>
-										<span class="ul-title">发布日期：</span>
+										<span class="ul-title">?/span>
 										<span class="ul-content">{{ itemData.publicationDate }}</span>
 									</li>
 									<li>
-										<span class="ul-title">资助经费：</span>
+										<span class="ul-title">韏蝏晶嚗?/span>
 										<span class="ul-content">{{ itemData.amount }}</span>
 									</li>
 									<li>
-										<span class="ul-title">涉及领域：</span>
+										<span class="ul-title">瘨?/span>
 										<span class="ul-pie cl1" v-for="value in itemData.toOrgNameList">{{ value }}</span>
 
 									</li>
 									<li>
-										<span class="ul-title">资助对象：</span>
+										<span class="ul-title">韏撖寡情嚗?/span>
 										<span class="ul-content">{{ itemData.fromOrgNameList.join(',') }}</span>
 									</li>
 								</ul>
@@ -48,7 +48,7 @@
 					</div>
 					<div class="left-bottom">
 						<ul>
-							<li class="left-bottom-li">内容摘要：</li>
+							<li class="left-bottom-li">捆?/li>
 						</ul>
 						<div class="left-bottom-content">{{ itemData.abstractContent }}
 						</div>
@@ -70,7 +70,7 @@
 					<div class="main-left" :class="{
 						cl4: item.signalLevel === '之',
 						cl5: item.signalLevel === '之憌',
-						cl6: item.signalLevel === '一般风险'
+						cl6: item.signalLevel === '銝憌?
 					}">
 						{{ item.signalLevel }}
 					</div>
@@ -89,7 +89,7 @@
 </template>
 
 <script setup>
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { ref, onMounted } from "vue";
 import {
 	getNewProject, getRiskSignal
@@ -105,14 +105,14 @@ const list = ref([
 	},
 	{
 		id: 2,
-		title: "一般风险",
-		content: "美国NASA公布NIAC计划2025年度第一轮资助",
+		title: "銝憌?,
+		content: "蝢NASA撣IAC霈∪2025撟游漲蝚砌頧株?,
 		time: "銝憭拙"
 	},
 	{
 		id: 3,
 		title: "之",
-		content: "美国NASA公布“早期创新计划”2026年资助...",
+		content: "蝢NASA撣霈∪?026撟渲?..",
 		time: "銝憭拙"
 	},
 	{
@@ -130,7 +130,7 @@ const list = ref([
 	{
 		id: 6,
 		title: "之",
-		content: "美国DARPA资助可调控生物功能微系统技术开发",
+		content: "蝢DARPA韏靚敺桃頂蝏撘?,
 		time: "銝憭拙"
 	}
 ]);
@@ -164,11 +164,11 @@ const handleSwithCurDecree = name => {
 		carouselRef.value.next();
 	}
 };
-//// 最新资助项目
+//// 韏憿寧?
 const handleGetNewProject = async () => {
 	try {
 		const res = await getNewProject();
-		console.log("最新资助项目", res);
+		console.log("韏憿寧?, res);
 		if (res.code === 200 && res.data) {
 			box1Data.value = res.data
 		}
@@ -505,7 +505,7 @@ onMounted(async () => {
 				overflow: hidden;
 				/*  */
 				text-overflow: ellipsis;
-				/* 超出部分显示省略号 */
+				/* 頞蝷箇?*/
 				width: 200px;
 				/* 霈曄蔭銝銝芸摰捐摨 */
 				height: 30px;