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

src/components/NewsList.vue

@@ -10,23 +10,23 @@
 			</div>
 		</div>
 		<div class="box3-main">
-			<div class="box3-item" v-for="(news, index) in list" :key="index" @click="handleClickToNewsDetail(news)">
+			<div class="box3-item" v-for="(news, index) in list.slice(0,5)" :key="index" @click="handleClickToNewsDetail(news)">
 				<div class="left">
 					<img
 						:src="getProxyUrl(news.newsImage) || defaultImg"
 						alt=""
 						referrerpolicy="no-referrer"
-						@error="e => (e.target.src = News1)"
+						@error="e => (e.target.src = errImg||News1)"
 					/>
 				</div>
 				<div class="right">
 					<div class="right-top">
-						<div class="title">{{ news.newsTitle }}</div>
+						<div class="title">{{ news.newsTitle||news.title }}</div>
 						<div class="time">
 							{{ news.newsDate ? news.newsDate.slice(5) : "" }} {{ news.newsOrg ? "-" + news.newsOrg : "" }}
 						</div>
 					</div>
-					<div class="right-footer">{{ news.newsContent }}</div>
+					<div class="right-footer">{{ news.newsContent||news.description }}</div>
 				</div>
 			</div>
 		</div>
@@ -38,7 +38,7 @@ import router from "@/router/index";
 import News1 from "@/assets/images/news1.png"; // 错误图片
 import defaultNew from "@/assets/images/default-icon-news.png"; // 默认图片
 
-let { list } = defineProps({
+let { list,errImg,defaultImg } = defineProps({
 	list: {
 		type: Array,
 		default: () => []
@@ -46,6 +46,10 @@ let { list } = defineProps({
 	defaultImg: {
 		type: String,
 		default: defaultNew
+	},
+	errImg: {
+		type: String,
+		default: ''
 	}
 });
 

src/views/exportControl/index.vue

@@ -2,7 +2,7 @@
 	<div class="home-wrapper">
 
 
-=======
+		=======
 		<div class="search-header" v-show="isShow">
 			<div class="home-main-header-center">
 				<el-input v-model="searchExportControlText" @keyup.enter="handleSearch" style="width: 800px; height: 100%"
@@ -50,15 +50,10 @@
 				<headerInfo curTitleName="出口管制"></headerInfo>
 			</div>
 		</div> -->
-		<div class="home-main" ref="homeMainRef" >
+		<div class="home-main" ref="homeMainRef">
 			<div class="home-main-header">
-					<SearchContainer
-						style="margin-bottom: 0; margin-top: 48px; height: fit-content"
-						v-if="homeMainRef"
-						placeholder="搜索出口管制"
-						:containerRef="homeMainRef"
-						areaName="实体清单"
-					/>
+				<SearchContainer style="margin-bottom: 0; margin-top: 48px; height: fit-content" v-if="homeMainRef"
+					placeholder="搜索出口管制" :containerRef="homeMainRef" areaName="实体清单" />
 				<div class="home-main-header-footer-info">
 					<InfoCard v-for="(item, index) in infoList" :key="item.id" :title="item.nameZh" :subtitle="item.nameAbbr"
 						:description="item.description" :quantity="item.postCount" unit="次" :color="infoListColor[index]"

src/views/finance/index.vue

@@ -599,7 +599,7 @@ const entityList = ref([
 
 const customNewsData = ref([
 	{
-		image: newsImg,
+		newsImage: newsImg,
 		title: "美国智库激辩人工智能监管路径",
 		time: "11-4",
 		source: "华盛顿邮报",
@@ -607,7 +607,7 @@ const customNewsData = ref([
 		description: "各方就AI监管模式展开讨论。有观点认为碎片化州级监管比全面联邦法规更灵活，也有分析..."
 	},
 	{
-		image: newsImg,
+		newsImage: newsImg,
 		title: "美国智库激辩人工智能监管路径",
 		time: "11-4",
 		source: "华盛顿邮报",
@@ -615,7 +615,7 @@ const customNewsData = ref([
 		description: "各方就AI监管模式展开讨论。有观点认为碎片化州级监管比全面联邦法规更灵活，也有分析..."
 	},
 	{
-		image: newsImg,
+		newsImage: newsImg,
 		title: "美国智库激辩人工智能监管路径",
 		time: "11-4",
 		source: "华盛顿邮报",
@@ -623,7 +623,7 @@ const customNewsData = ref([
 		description: "各方就AI监管模式展开讨论。有观点认为碎片化州级监管比全面联邦法规更灵活，也有分析..."
 	},
 	{
-		image: newsImg,
+		newsImage: newsImg,
 		title: "美国智库激辩人工智能监管路径",
 		time: "11-4",
 		source: "华盛顿邮报",
@@ -631,7 +631,7 @@ const customNewsData = ref([
 		description: "各方就AI监管模式展开讨论。有观点认为碎片化州级监管比全面联邦法规更灵活，也有分析..."
 	},
 	{
-		image: newsImg,
+		newsImage: newsImg,
 		title: "美国智库激辩人工智能监管路径",
 		time: "11-4",
 		source: "华盛顿邮报",