Merge branch 'zz-dev'

src/views/bill/billHome/index.vue

@@ -148,8 +148,8 @@
 													{{ bill.billName }}
 												</div>
 												<div class="box1-main-left-info">
-													<AreaTag 	v-for="(item, index) in bill.hylyList"
-														:key="index" :tagName="item.industryName"></AreaTag>
+													<AreaTag v-for="(item, index) in bill.hylyList" :key="index" :tagName="item.industryName">
+													</AreaTag>
 
 													<div class="info-box" :class="{
 														info1: index === 0,
@@ -249,7 +249,7 @@
 					</div>
 					<DivideHeader id="position2" class="divide2" :titleText="'资讯要闻'"></DivideHeader>
 					<div class="center-center">
-						<div class="box3">
+						<!-- <div class="box3">
 							<div class="box3-header">
 								<div class="box3-header-left">
 									<div class="box3-header-icon">
@@ -284,11 +284,12 @@
 										<div class="right-footer">{{ news.newsContent }}</div>
 										<!-- <CommonPrompt :content="news.newsContent">
 											<div class="right-footer">{{ news.newsContent }}</div>
-										</CommonPrompt> -->
-									</div>
+										</CommonPrompt> --
 									</div>
 								</div>
 							</div>
+						</div> -->
+						<NewsList :list="newsList.slice(0, 5)" />
 						<div class="box4">
 							<div class="box4-header">
 								<div class="header-icon">
@@ -990,7 +991,7 @@ const handleGetNews = async () => {
 		const res = await getNews(params);
 		console.log("新闻资讯", res);
 		if (res.code === 200) {
-			newsList.value = res.data||[].map(item => {
+			newsList.value = res.data || [].map(item => {
 				return {
 					...item,
 					from: `${item.newsOrg} · ${item.newsDate ? item.newsDate.slice(5) : ""}`,

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

@@ -48,6 +48,7 @@
 </template>
 
 <script setup>
+import NewsList from "@/components/NewsList/NewsList.vue";
 import { ref, onMounted } from "vue";
 import router from '@/router'
 import { getCoopRestrictionNews, getCoopRestrictionSocial } from '@/api/coopRestriction/coopRestriction'

src/views/decree/decreeHome/index.vue

@@ -13,13 +13,8 @@
 				</div> -->
 
 				<div class="home-main-header-center">
-					<SearchContainer
-						style="margin-bottom: 0; margin-top: 48px; height: fit-content"
-						v-if="containerRef"
-						placeholder="搜索政令"
-						:containerRef="containerRef"
-						areaName="政令"
-					/>
+					<SearchContainer style="margin-bottom: 0; margin-top: 48px; height: fit-content" v-if="containerRef"
+						placeholder="搜索政令" :containerRef="containerRef" areaName="政令" />
 					<!-- <el-input v-model="searchDecreeText" @keyup.enter="handleSearch" style="width: 838px; height: 100%"
 						placeholder="搜索政令" />
 					<div class="search">
@@ -111,14 +106,8 @@
 								{{ "查看详情 >" }}
 							</div>
 						</div>
-						<el-carousel
-							ref="carouselRef"
-							height="395px"
-							:autoplay="true"
-							:interval="3000"
-							arrow="never"
-							indicator-position="none"
-						>
+						<el-carousel ref="carouselRef" height="395px" :autoplay="true" :interval="3000" arrow="never"
+							indicator-position="none">
 							<el-carousel-item v-for="(item, index) in box1DataList" :key="index">
 								<div class="box1-main">
 									<div class="box1-main-left">
@@ -135,16 +124,11 @@
 											{{ item.name }}
 										</div>
 										<div class="box1-main-right-info">
-											<div
-												class="tag"
-												:class="{
+											<div class="tag" :class="{
 												tag1: tag.status == 1,
 												tag2: tag.status == 2,
 												tag3: tag.status == 3
-												}"
-												v-for="(tag, index) in item.industryList"
-												:key="index"
-											>
+											}" v-for="(tag, index) in item.industryList" :key="index">
 												{{ tag.industryName }}
 											</div>
 										</div>
@@ -213,10 +197,6 @@
 				</div>
 				<DivideHeader id="position2" class="divide2" :titleText="'资讯要闻'"></DivideHeader>
 				<div class="center-center">
-<<<<<<< HEAD
-						<NewsList :list="newsList.slice(0, 5)"/>
-			
-=======
 					<!-- <div class="box3">
 						<div class="box3-header">
 							<div class="box3-header-left">
@@ -248,7 +228,6 @@
 </div>
 </div> -->
 					<NewsList :newsList="newsList" @item-click="handleToNewsAnalysis" @more-click="handleToMoreNews" />
->>>>>>> zz-dev
 					<div class="box4">
 						<div class="box4-header">
 							<div class="header-icon">
@@ -257,17 +236,9 @@
 							<div class="header-title">{{ "社交媒体" }}</div>
 						</div>
 						<div class="box4-main">
-							<MessageBubble
-								v-for="(item, index) in messageList"
-								@click="handleClickPerson(item)"
-								@info-click="handleMediaClick(item)"
-								:key="index"
-								:avatar="item.img ? item.img : DefaultIcon1"
-								:name="item.name"
-								:time="item.time"
-								:source="item.source"
-								:content="item.content"
-							/>
+							<MessageBubble v-for="(item, index) in messageList" @click="handleClickPerson(item)"
+								@info-click="handleMediaClick(item)" :key="index" :avatar="item.img ? item.img : DefaultIcon1"
+								:name="item.name" :time="item.time" :source="item.source" :content="item.content" />
 							<!-- <div class="box4-main-item" v-for="(item, index) in messageList" :key="index">
 								<div class="left" @click="handleClickPerson(item)">
 									<img :src="item.img ? item.img : DefaultIcon1" alt="" />
@@ -294,18 +265,9 @@
 								<div class="box5-header-title">{{ "行政令发布频度" }}</div>
 							</div>
 							<div class="box5-selectbox">
-								<el-select
-									@change="handleBox5YearChange"
-									v-model="box5SelectedYear"
-									placeholder="选择时间"
-									style="width: 120px"
-								>
-									<el-option
-										v-for="item in box5YearList"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-									/>
+								<el-select @change="handleBox5YearChange" v-model="box5SelectedYear" placeholder="选择时间"
+									style="width: 120px">
+									<el-option v-for="item in box5YearList" :key="item.value" :label="item.label" :value="item.value" />
 								</el-select>
 							</div>
 						</div>
@@ -321,18 +283,9 @@
 							</div>
 							<div class="header-title">{{ "政令涉及领域" }}</div>
 							<div class="box6-selectbox">
-								<el-select
-									@change="handleBox6YearChange"
-									v-model="box6SelectedYear"
-									placeholder="选择时间"
-									style="width: 120px"
-								>
-									<el-option
-										v-for="item in box6YearList"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-									/>
+								<el-select @change="handleBox6YearChange" v-model="box6SelectedYear" placeholder="选择时间"
+									style="width: 120px">
+									<el-option v-for="item in box6YearList" :key="item.value" :label="item.label" :value="item.value" />
 								</el-select>
 							</div>
 						</div>
@@ -348,12 +301,7 @@
 							<div class="header-title">{{ "关键行政令" }}</div>
 						</div>
 						<div class="box7-main">
-							<div
-								class="box7-item"
-								v-for="(item, index) in keyDecreeList"
-								:key="index"
-								@click="handleKeyDecree(item)"
-							>
+							<div class="box7-item" v-for="(item, index) in keyDecreeList" :key="index" @click="handleKeyDecree(item)">
 								<div class="icon">
 									<img src="./assets/images/warning.png" alt="" />
 								</div>
@@ -409,15 +357,9 @@
 							</div>
 							<div class="select-main">
 								<div class="checkbox-group">
-									<el-checkbox
-										v-for="type in decreeTypeList"
-										:key="type.id"
-										v-model="checkedDecreeType"
-										:label="type.typeId"
-										style="width: 180px"
-										class="filter-checkbox"
-										@change="handleChangeCheckedDecreeType"
-									>
+									<el-checkbox v-for="type in decreeTypeList" :key="type.id" v-model="checkedDecreeType"
+										:label="type.typeId" style="width: 180px" class="filter-checkbox"
+										@change="handleChangeCheckedDecreeType">
 										{{ type.typeName }}
 									</el-checkbox>
 								</div>
@@ -430,15 +372,8 @@
 							</div>
 							<div class="select-main">
 								<div class="checkbox-group">
-									<el-checkbox
-										v-for="cate in govInsList"
-										:key="cate.id"
-										v-model="checkedGovIns"
-										:label="cate.id"
-										style="width: 180px"
-										class="filter-checkbox"
-										@change="handleChangeCheckedGovIns"
-									>
+									<el-checkbox v-for="cate in govInsList" :key="cate.id" v-model="checkedGovIns" :label="cate.id"
+										style="width: 180px" class="filter-checkbox" @change="handleChangeCheckedGovIns">
 										{{ cate.name }}
 									</el-checkbox>
 								</div>
@@ -451,15 +386,9 @@
 							</div>
 							<div class="select-main">
 								<div class="checkbox-group">
-									<el-checkbox
-										v-for="time in pubTime"
-										:key="time.id"
-										v-model="activePubTime"
-										:label="time.id"
-										style="width: 100px"
-										class="filter-checkbox"
-										@change="checked => handlePubTimeChange(time.id, checked)"
-									>
+									<el-checkbox v-for="time in pubTime" :key="time.id" v-model="activePubTime" :label="time.id"
+										style="width: 100px" class="filter-checkbox"
+										@change="checked => handlePubTimeChange(time.id, checked)">
 										{{ time.name }}
 									</el-checkbox>
 								</div>
@@ -472,14 +401,8 @@
 							</div>
 							<div class="select-main select-main1">
 								<div class="checkbox-group">
-									<el-checkbox
-										v-for="area in areaList"
-										:key="area.id"
-										v-model="activeAreaList"
-										:label="area.id"
-										style="width: 100px"
-										@change="checked => handleAreaChange(area.id, checked)"
-									>
+									<el-checkbox v-for="area in areaList" :key="area.id" v-model="activeAreaList" :label="area.id"
+										style="width: 100px" @change="checked => handleAreaChange(area.id, checked)">
 										{{ area.name }}
 									</el-checkbox>
 								</div>
@@ -494,16 +417,7 @@
 							<div class="title">{{ "政令库" }}</div>
 						</div>
 						<div class="content-box" v-show="decreeList">
-<<<<<<< HEAD
-							<div
-								class="main-item"
-								v-for="(item, index) in decreeList"
-								:key="index"
-								@click="handleClickDecree(item)"
-							>
-=======
 							<div class="main-item" v-for="(item, index) in decreeList" :key="index" @click="handleClickDecree(item)">
->>>>>>> zz-dev
 								<div class="main-item-left">
 									<div class="left-left">
 										{{ item.time.split("-")[0] }}<br />{{ item.time.split("-")[1] }}月{{
@@ -545,14 +459,8 @@
 								{{ `共 ${totalDecreesNum} 项` }}
 							</div>
 							<div class="footer-right">
-								<el-pagination
-									@current-change="handleCurrentChange"
-									:pageSize="10"
-									:current-page="currentPage"
-									background
-									layout="prev, pager, next"
-									:total="totalDecreesNum"
-								/>
+								<el-pagination @current-change="handleCurrentChange" :pageSize="10" :current-page="currentPage"
+									background layout="prev, pager, next" :total="totalDecreesNum" />
 							</div>
 						</div>
 					</div>
@@ -667,7 +575,7 @@ const govInsList = ref([
 ]);
 const checkedGovIns = ref([]);
 
-const handleChangeCheckedGovIns = val => {};
+const handleChangeCheckedGovIns = val => { };
 
 const handleGetDepartmentList = async () => {
 	try {
@@ -828,16 +736,16 @@ const handleGetNews = async () => {
 		const res = await getNews(params);
 		console.log("新闻资讯", res);
 		if (res.code === 200 && res.data) {
-				newsList.value = res.data||[]
-			// newsList.value = res.data.map(item => {
-			// 	return {
-			// 		newsId: item.newsId,
-			// 		img: item.newsImage,
-			// 		title: item.newsTitle,
-			// 		content: item.newsContent,
-			// 		from: item.newsDate + " · " + item.newsOrg
-			// 	};
-			// });
+			// newsList.value = res.data || []
+			newsList.value = (res.data ?? []).map(item => {
+				return {
+					newsId: item.newsId,
+					img: item.newsImage,
+					title: item.newsTitle,
+					content: item.newsContent,
+					from: item.newsDate + " · " + item.newsOrg
+				};
+			});
 		}
 	} catch (error) {
 		console.error("新闻资讯error", error);
@@ -889,7 +797,7 @@ const handleGetMessage = async () => {
 				remarksId: item.remarksId
 			};
 		});
-	} catch (error) {}
+	} catch (error) { }
 };
 handleGetMessage();
 
@@ -947,7 +855,7 @@ const handleClickPerson = async item => {
 			ElMessage.warning("找不到当前人员的类型值！");
 			return;
 		}
-	} catch (error) {}
+	} catch (error) { }
 };
 
 // 行政令发布频度
@@ -1101,7 +1009,7 @@ const handleGetKeyDecree = async () => {
 				};
 			});
 		}
-	} catch (error) {}
+	} catch (error) { }
 };
 
 handleGetKeyDecree();
@@ -1202,7 +1110,7 @@ const handleGetDecreeTypeList = async () => {
 		if (res.code === 200 && res.data) {
 			decreeTypeList.value = res.data;
 		}
-	} catch (error) {}
+	} catch (error) { }
 };
 
 const handleChangeCheckedDecreeType = () => {
@@ -1279,7 +1187,7 @@ const handleGetAreaList = async () => {
 			// 获取列表后重新查询
 			handleGetDecreeOrderList();
 		}
-	} catch (error) {}
+	} catch (error) { }
 };
 
 const totalDecreesNum = ref(0);
@@ -1894,11 +1802,16 @@ onMounted(async () => {
 								font-weight: 700;
 								line-height: 26px;
 
-								display: -webkit-box; /* 将元素设置为弹性盒模型 */
-								-webkit-line-clamp: 2; /* 限制文本显示的行数 */
-								-webkit-box-orient: vertical; /* 设置弹性盒子的子元素垂直排列 */
-								overflow: hidden; /* 隐藏溢出的内容 */
-								text-overflow: ellipsis; /* 文本溢出时显示省略号 */
+								display: -webkit-box;
+								/* 将元素设置为弹性盒模型 */
+								-webkit-line-clamp: 2;
+								/* 限制文本显示的行数 */
+								-webkit-box-orient: vertical;
+								/* 设置弹性盒子的子元素垂直排列 */
+								overflow: hidden;
+								/* 隐藏溢出的内容 */
+								text-overflow: ellipsis;
+								/* 文本溢出时显示省略号 */
 							}
 
 							.box1-main-right-info {
@@ -1951,9 +1864,12 @@ onMounted(async () => {
 								font-size: 16px;
 								font-weight: 400;
 								line-height: 30px;
-								display: -webkit-box; /* 将元素设置为弹性盒模型 */
-								overflow: hidden; /* 隐藏溢出的内容 */
-								text-overflow: ellipsis; /* 文本溢出时显示省略号 */
+								display: -webkit-box;
+								/* 将元素设置为弹性盒模型 */
+								overflow: hidden;
+								/* 隐藏溢出的内容 */
+								text-overflow: ellipsis;
+								/* 文本溢出时显示省略号 */
 							}
 
 							.box1-main-right-footer {

src/views/exportControl/index.vue

 <template>
 	<div class="home-wrapper">
-<<<<<<< HEAD
+
 
 =======
 		<div class="search-header" v-show="isShow">
@@ -41,7 +41,7 @@
 				</div>
 			</div>
 		</div>
->>>>>>> zz-dev
+
 		<!-- <div class="home-header" v-show="!isShow">
 			<div class="header-left">
 				<HeaderMenu></HeaderMenu>
@@ -202,15 +202,9 @@
 
 			<el-row :gutter="15" style="width: 1600px; margin: 0 auto; height: 50px; margin-top: 64px">
 				<CustomTitle id="position2" title="资讯要闻" />
-<<<<<<< HEAD
-				<el-col :span="12">
-						<NewsList :list="newsList.slice(0, 5)" :defaultImg="newsImg" />
-					<!-- <custom-container title="新闻资讯" :titleIcon="newsIcon" height="450px">
-=======
 			</el-row>
 			<!-- <el-col :span="12">
 					<custom-container title="新闻资讯" :titleIcon="newsIcon" height="450px">
->>>>>>> zz-dev
 						<template #header-right>
 							<el-button type="primary" link @click="handleToMoreNews">
 								{{ "更多 +" }}
@@ -222,11 +216,6 @@
 								<NewsList :list-data="newsList" @item-click="item => handleNewsInfoClick(item)" />
 							</div>
 						</template>
-<<<<<<< HEAD
-					</custom-container> -->
-				</el-col>
-				<el-col :span="12">
-=======
 					</custom-container>
 				</el-col> -->
 			<div class="center-center">
@@ -235,7 +224,6 @@
 						content="newsContent" />
 				</div>
 				<div class="boxs4">
->>>>>>> zz-dev
 					<custom-container title="社交媒体" :titleIcon="dialogIcon" height="450px">
 						<template #default>
 							<div class="dialog-list">
@@ -639,11 +627,6 @@ import CustomContainer from "@/components/Container/index.vue";
 import ClickableCard from "./components/link.vue";
 import InfoCard from "./components/info.vue";
 import CustomTitle from "./components/title.vue";
-<<<<<<< HEAD
-// import NewsList from "./components/news.vue";
-import newsImg from "@/assets/images/news-img.png";
-=======
->>>>>>> zz-dev
 
 import MessageBubble from "./components/dialog.vue";
 import CommonPrompt from "./commonPrompt/index.vue";

src/views/finance/index.vue

@@ -1708,61 +1708,6 @@ onMounted(async () => {
 				margin-top: 43px;
 			}
 
-<<<<<<< HEAD
-=======
-			.home-main-header-center {
-				margin: 0 auto;
-				margin-top: 20px;
-				width: 800px;
-				height: 48px;
-				border-radius: 10px;
-				box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
-				background: rgba(255, 255, 255, 1);
-				box-sizing: border-box;
-				padding: 1px;
-				position: relative;
-				border: 1px solid transparent;
-
-				&:hover {
-					border: 1px solid var(--color-main-active);
-				}
-
-				.search {
-					position: absolute;
-					right: -1px;
-					top: 0px;
-					width: 120px;
-					height: 46px;
-					border-radius: 10px;
-					background: var(--color-main-active);
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					cursor: pointer;
-
-					.search-icon {
-						width: 18px;
-						height: 18px;
-
-						img {
-							width: 100%;
-							height: 100%;
-						}
-					}
-
-					.search-text {
-						margin-left: 8px;
-						height: 22px;
-						color: #fff;
-						font-family: Microsoft YaHei;
-						font-size: 16px;
-						font-weight: 400;
-						line-height: 22px;
-					}
-				}
-			}
-
->>>>>>> zz-dev
 			.home-main-header-footer {
 				margin-top: 38px;
 				width: 700px;

src/views/innovationSubject/index.vue

@@ -13,13 +13,8 @@
 					</div>
 				</div> -->
 				<div class="home-main-header-center">
-						<SearchContainer
-							style="margin-bottom: 0;margin-top: 48px; "
-							v-if="containerRef"
-							placeholder="搜索创新主体"
-							:containerRef="containerRef"
-							areaName=""
-						/>
+					<SearchContainer style="margin-bottom: 0;margin-top: 48px; " v-if="containerRef" placeholder="搜索创新主体"
+						:containerRef="containerRef" areaName="" />
 					<!-- <el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索创新主体" />
 					<div class="search">
 						<div class="search-icon">
@@ -376,6 +371,7 @@
 
 <script setup>
 import RiskSignal from "@/components/RiskSignal/RiskSignal.vue";
+import NewsList from "@/components/NewsList/NewsList.vue";
 import { onMounted, ref, computed } from "vue";
 import * as echarts from "echarts";
 import router from "@/router";

src/views/marketAccessRestrictions/marketAccessHome/index.vue

@@ -11,13 +11,8 @@
 					</div>
 				</div> -->
 				<div class="home-main-header-center">
-					<SearchContainer
-						style="margin-bottom: 0;margin-top: 48px;  height: fit-content"
-						v-if="containerRef"
-						placeholder="搜索市场准入限制调查"
-						:containerRef="containerRef"
-						areaName=""
-					/>
+					<SearchContainer style="margin-bottom: 0;margin-top: 48px;  height: fit-content" v-if="containerRef"
+						placeholder="搜索市场准入限制调查" :containerRef="containerRef" areaName="" />
 				</div>
 				<!-- <div class="home-main-header-footer">
 					<div class="home-main-header-footer-item">
@@ -562,6 +557,7 @@
 </template>
 
 <script setup>
+import NewsList from "@/components/NewsList/NewsList.vue";
 import RiskSignal from "@/components/RiskSignal/RiskSignal.vue";
 import { onMounted, ref } from "vue";
 import setChart from "@/utils/setChart";
@@ -1580,62 +1576,7 @@ onMounted(async () => {
 				display: flex;
 				justify-content: space-between;
 			}
-<<<<<<< HEAD
-	
-=======
-
-			.home-main-header-center {
-				margin-top: 48px;
-				width: 960px;
-				height: 48px;
-				border-radius: 10px;
-				box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
-				background: rgba(255, 255, 255, 1);
-				box-sizing: border-box;
-				padding: 1px;
-				position: relative;
-				border: 1px solid transparent;
-
-				&:hover {
-					border: 1px solid var(--color-main-active);
-				}
-
-				.search {
-					position: absolute;
-					right: -1px;
-					top: 0px;
-					width: 120px;
-					height: 46px;
-					border-radius: 10px;
-					background: var(--color-main-active);
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					cursor: pointer;
-
-					.search-icon {
-						width: 18px;
-						height: 18px;
-
-						img {
-							width: 100%;
-							height: 100%;
-						}
-					}
-
-					.search-text {
-						margin-left: 8px;
-						height: 22px;
-						color: #fff;
-						font-family: Microsoft YaHei;
-						font-size: 16px;
-						font-weight: 400;
-						line-height: 22px;
-					}
-				}
-			}
 
->>>>>>> zz-dev
 			.home-main-header-footer {
 				margin-top: 38px;
 				width: 688px;

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

@@ -50,6 +50,7 @@
 </template>
 
 <script setup>
+import NewsList from "@/components/NewsList/NewsList.vue";
 import { ref, onMounted } from "vue";
 import {
     getSocialMediaInfo, getNews

src/views/thinkTank/index.vue

 <template>
 	<div class="home-wrapper">
-<<<<<<< HEAD
 		<div class="home-main" ref="containerRef">
-=======
-		<div class="search-header" v-show="isShow">
-			<div class="search-header-container">
-
-				<div class="home-main-header-center">
-					<el-input v-model="searchThinktankText" @keyup.enter="handleSearch" style="width: 680px; height: 100%"
-						placeholder="搜索智库报告" />
-					<div class="search">
-						<div class="search-icon">
-							<img src="./assets/images/search-icon.png" alt="" />
-						</div>
-						<div class="search-text" @click="handleSearch">搜索</div>
-					</div>
-				</div>
-				<div class="home-main-header-btn-box">
-					<div class="btn" @click="handleToPosi('position1')">
-						<div class="btn-text">{{ "最新动态" }}</div>
-						<div class="btn-icon">
-							<img src="@/assets/icons/arrow-right-icon.png" alt="" />
-						</div>
-					</div>
-					<div class="btn" @click="handleToPosi('position2')">
-						<div class="btn-text">{{ "资讯要闻" }}</div>
-						<div class="btn-icon">
-							<img src="@/assets/icons/arrow-right-icon.png" alt="" />
-						</div>
-					</div>
-					<div class="btn" @click="handleToPosi('position3')">
-						<div class="btn-text">{{ "数据总览" }}</div>
-						<div class="btn-icon">
-							<img src="@/assets/icons/arrow-right-icon.png" alt="" />
-						</div>
-					</div>
-					<div class="btn" @click="handleToPosi('position4')">
-						<div class="btn-text">{{ "资源库" }}</div>
-						<div class="btn-icon">
-							<img src="@/assets/icons/arrow-right-icon.png" alt="" />
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="home-main" :class="{ scrollHomeMain: isShow }" ref="containerRef">
->>>>>>> zz-dev
 			<div class="home-top-bg"></div>
 			<div class="home-main-header">
 				<!-- <div class="home-main-header-top">
@@ -57,22 +12,11 @@
 					</div>
 				</div> -->
 
-<<<<<<< HEAD
 				<div class="home-main-header-center">
-					<SearchContainer
-						style="margin-bottom: 0; margin-top: 48px; height: fit-content"
-						v-if="containerRef"
-						placeholder="搜索智库报告"
-						:containerRef="containerRef"
-						areaName="智库"
-					/>
+					<SearchContainer style="margin-bottom: 0; margin-top: 48px; height: fit-content" v-if="containerRef"
+						placeholder="搜索智库报告" :containerRef="containerRef" areaName="智库" />
 					<!-- <el-input v-model="searchThinktankText" @keyup.enter="handleSearch"
 						style="width: 838px; height: 100%" placeholder="搜索智库报告" />
-=======
-				<div class="home-main-header-center" v-show="!isShow">
-					<el-input v-model="searchThinktankText" @keyup.enter="handleSearch" style="width: 838px; height: 100%"
-						placeholder="搜索智库报告" />
->>>>>>> zz-dev
 					<div class="search">
 						<div class="search-icon">
 							<img src="./assets/images/search-icon.png" alt="" />
@@ -122,17 +66,12 @@
 </el-popover> -->
 						<div class="content">{{ item.desc }}</div>
 						<div class="tag-box">
-							<div
-								class="tag"
-								:class="{
+							<div class="tag" :class="{
 								tag1: val.status === 1,
 								tag2: val.status === 2,
 								tag3: val.status === 3,
 								tag4: val.status === 4
-								}"
-								v-for="(val, idx) in item.tagList"
-								:key="idx"
-							>
+							}" v-for="(val, idx) in item.tagList" :key="idx">
 								{{ val.industryName }}
 							</div>
 						</div>
@@ -167,14 +106,8 @@
 							</div>
 							<div class="box1-header-right" @click="handleClickToDetail">查看详情 ></div>
 						</div>
-						<el-carousel
-							ref="carouselRef"
-							height="395px"
-							:autoplay="true"
-							:interval="3000"
-							arrow="never"
-							indicator-position="none"
-						>
+						<el-carousel ref="carouselRef" height="395px" :autoplay="true" :interval="3000" arrow="never"
+							indicator-position="none">
 							<el-carousel-item v-for="(itemData, index) in box1Data" :key="index">
 								<div class="box1-main">
 									<div class="box1-main-left">
@@ -268,16 +201,12 @@
 							</div>
 						</div>
 						<div class="box3-main">
-<<<<<<< HEAD
 							<div
 								class="box3-item"
 								v-for="(news, index) in newsList"
 								:key="index"
 								@click="handleToNewsAnalysis(news)"
 							>
-=======
-							<div class="box3-item" v-for="(news, index) in newsList" :key="index" @click="handleToNewsAnalysis(news)">
->>>>>>> zz-dev
 								<div class="left">
 									<img :src="news.newsImage !== null ? news.newsImage : defaultNewsIcon" />
 								</div>
@@ -319,22 +248,9 @@
 							</div>
 						</div> -->
 						<div class="box4-main">
-<<<<<<< HEAD
-							<MessageBubble
-								v-for="(item, index) in messageList"
-								@click="handleClickPerson(item)"
-								:key="index"
-								:avatar="item.personImage ? item.personImage : defaultHeaderIcin"
-								:name="item.personName"
-								:time="item.time"
-								:source="item.orgName"
-								:content="item.remarks"
-							/>
-=======
 							<MessageBubble v-for="(item, index) in messageList" @click="handleClickPerson(item)" :key="index"
 								:avatar="item.personImage ? item.personImage : defaultHeaderIcin" :name="item.personName"
 								:time="item.time" :source="item.orgName" :content="item.remarks" />
->>>>>>> zz-dev
 							<!-- <div class="box4-main-item" v-for="(item, index) in messageList" :key="index">
 								<div class="left" @click="handleClickPerson(item)">
 									<img :src="item.personImage ? item.personImage : defaultHeaderIcin" alt="" />
@@ -362,18 +278,8 @@
 							</div>
 							<div class="box5-select-box">
 								<el-select v-model="box5selectetedMonths" placeholder="选择时间" style="width: 120px">
-<<<<<<< HEAD
-									<el-option
-										v-for="item in box5MonthsList"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-										@click="changeBox5Data(item.value)"
-									/>
-=======
 									<el-option v-for="item in box5MonthsList" :key="item.value" :label="item.label" :value="item.value"
 										@click="changeBox5Data(item.value)" />
->>>>>>> zz-dev
 								</el-select>
 							</div>
 						</div>
@@ -387,18 +293,8 @@
 							<div class="header-title">{{ "政策建议领域分布" }}</div>
 							<div class="box6-select-box">
 								<el-select v-model="box6selectetedYear" placeholder="选择时间" style="width: 120px">
-<<<<<<< HEAD
-									<el-option
-										v-for="item in box6YearList"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-										@click="handleBox6()"
-									/>
-=======
 									<el-option v-for="item in box6YearList" :key="item.value" :label="item.label" :value="item.value"
 										@click="handleBox6()" />
->>>>>>> zz-dev
 								</el-select>
 							</div>
 						</div>
@@ -427,35 +323,21 @@
 							</div>
 							<div class="box8-select-box">
 								<el-select v-model="box8selectetedYear" placeholder="选择时间" style="width: 120px">
-<<<<<<< HEAD
-									<el-option
-										v-for="item in box8YearList"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-										@click="changeBox8Data(item.value)"
-									/>
-=======
 									<el-option v-for="item in box8YearList" :key="item.value" :label="item.label" :value="item.value"
 										@click="changeBox8Data(item.value)" />
->>>>>>> zz-dev
 								</el-select>
 							</div>
 						</div>
 						<div class="box8-main">
 							<div class="box8-item" v-for="(item, index) in box8Data" :key="index">
-								<div
-									class="item-left"
-									:class="{ itemBold1: index === 0, itemBold2: index === 1, itemBold3: index === 2 }"
-								>
+								<div class="item-left"
+									:class="{ itemBold1: index === 0, itemBold2: index === 1, itemBold3: index === 2 }">
 									{{ index + 1 }}
 								</div>
 								<!-- <el-popover effect="dark" :content="item.clause" placement="top-start">
 									<template #reference> -->
-								<div
-									class="item-center"
-									:class="{ itemBold1: index === 0, itemBold2: index === 1, itemBold3: index === 2 }"
-								>
+								<div class="item-center"
+									:class="{ itemBold1: index === 0, itemBold2: index === 1, itemBold3: index === 2 }">
 									{{ item.clause }}
 								</div>
 								<!-- </template>
@@ -473,18 +355,8 @@
 
 				<div class="home-main-footer-header">
 					<div class="btn-box">
-<<<<<<< HEAD
-						<div
-							class="btn"
-							:class="{ btnActive: activeCate === cate }"
-							v-for="(cate, index) in categoryList"
-							:key="index"
-							@click="handleClickCate(cate)"
-						>
-=======
 						<div class="btn" :class="{ btnActive: activeCate === cate }" v-for="(cate, index) in categoryList"
 							:key="index" @click="handleClickCate(cate)">
->>>>>>> zz-dev
 							{{ cate }}
 						</div>
 					</div>
@@ -515,31 +387,12 @@
 							</div>
 							<div class="select-main">
 								<div class="checkbox-group">
-<<<<<<< HEAD
-									<el-checkbox
-										v-model="checkAll"
-										:indeterminate="isIndeterminate"
-										class="all-checkbox"
-										@change="handleCheckAllChange"
-									>
-										全部领域
-									</el-checkbox>
-									<el-checkbox
-										v-for="research in areaList"
-										:key="research.id"
-										v-model="selectedAreaList"
-										:label="research.id"
-										@change="handleCheckedAreaChange()"
-										class="filter-checkbox"
-									>
-=======
 									<el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" class="all-checkbox"
 										@change="handleCheckAllChange">
 										全部领域
 									</el-checkbox>
 									<el-checkbox v-for="research in areaList" :key="research.id" v-model="selectedAreaList"
 										:label="research.id" @change="handleCheckedAreaChange()" class="filter-checkbox">
->>>>>>> zz-dev
 										{{ research.name }}
 									</el-checkbox>
 								</div>
@@ -553,24 +406,6 @@
 							</div>
 							<div class="select-main">
 								<div class="checkbox-group">
-<<<<<<< HEAD
-									<el-checkbox
-										v-model="checkAllTime"
-										class="all-checkbox"
-										:indeterminate="isIndeterminateTime"
-										@change="handleCheckAllChangeTime"
-									>
-										全部时间
-									</el-checkbox>
-									<el-checkbox-group v-model="selectedPubTimeList">
-										<el-checkbox
-											v-for="time in pubTimeList"
-											:key="time.id"
-											:label="time.id"
-											class="filter-checkbox"
-											@change="handleCheckedAreaChangeTime()"
-										>
-=======
 									<el-checkbox v-model="checkAllTime" class="all-checkbox" :indeterminate="isIndeterminateTime"
 										@change="handleCheckAllChangeTime">
 										全部时间
@@ -578,7 +413,6 @@
 									<el-checkbox-group v-model="selectedPubTimeList">
 										<el-checkbox v-for="time in pubTimeList" :key="time.id" :label="time.id" class="filter-checkbox"
 											@change="handleCheckedAreaChangeTime()">
->>>>>>> zz-dev
 											{{ time.name }}
 										</el-checkbox>
 									</el-checkbox-group>
@@ -588,12 +422,8 @@
 					</div>
 					<div class="right">
 						<div class="card-box">
-							<div
-								class="footer-card"
-								v-for="(item, index) in curFooterList"
-								:key="index"
-								@click="handleToReportDetail(item)"
-							>
+							<div class="footer-card" v-for="(item, index) in curFooterList" :key="index"
+								@click="handleToReportDetail(item)">
 								<div class="footer-card-top">
 									<img :src="item.imageUrl" alt="" />
 								</div>
@@ -616,14 +446,8 @@
 						<div class="right-footer">
 							<div class="info">共 {{ total }} 项</div>
 							<div class="page-box">
-								<el-pagination
-									:page-size="12"
-									background
-									layout="prev, pager, next"
-									:total="total"
-									@current-change="handleCurrentChange"
-									:current-page="currentPage"
-								/>
+								<el-pagination :page-size="12" background layout="prev, pager, next" :total="total"
+									@current-change="handleCurrentChange" :current-page="currentPage" />
 							</div>
 						</div>
 					</div>
@@ -635,6 +459,7 @@
 
 <script setup>
 import RiskSignal from "@/components/RiskSignal/RiskSignal.vue";
+import NewsList from "@/components/NewsList/NewsList.vue";
 import { onMounted, ref, computed, reactive, nextTick } from "vue";
 import scrollToTop from "@/utils/scrollToTop";
 import router from "@/router";
@@ -1709,7 +1534,7 @@ const handleClickPerson = async item => {
 			ElMessage.warning("找不到当前人员的类型值！");
 			return;
 		}
-	} catch (error) {}
+	} catch (error) { }
 };
 
 // 点击新闻条目，跳转到新闻分析页
@@ -1929,57 +1754,6 @@ onMounted(async () => {
 			}
 
 
-<<<<<<< HEAD
-=======
-				box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
-				background: rgba(255, 255, 255, 0.65);
-				box-sizing: border-box;
-				padding: 1px;
-				position: relative;
-				border: 1px solid rgba(255, 255, 255, 1);
-
-				border-radius: 10px;
-
-
-				&:hover {
-					border: 1px solid var(--color-main-active);
-				}
-
-				.search {
-					position: absolute;
-					right: -1px;
-					top: 0px;
-					width: 120px;
-					height: 46px;
-					border-radius: 10px;
-					background: var(--color-main-active);
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					cursor: pointer;
-
-					.search-icon {
-						width: 18px;
-						height: 18px;
-
-						img {
-							width: 100%;
-							height: 100%;
-						}
-					}
-
-					.search-text {
-						margin-left: 8px;
-						height: 22px;
-						color: #fff;
-						font-family: Microsoft YaHei;
-						font-size: 16px;
-						font-weight: 400;
-						line-height: 22px;
-					}
-				}
-			}
->>>>>>> zz-dev
 
 			.home-main-header-footer {
 				margin-top: 38px;