Merge branch 'zz-dev'

4d6c5857 · 朱政 · b1e8b7ab · d82da293 · 4d6c5857 · 4d6c5857
--- a/src/components/NewsList/NewsList.vue
+++ b/src/components/NewsList/NewsList.vue
+<template>
+  <div class="box3">
+    <div class="box3-header">
+      <div class="box3-header-left">
+        <div class="box3-header-icon">
+          <img src="./image1.png" alt="" />
+        </div>
+        <div class="box3-header-title">{{ "新闻资讯" }}</div>
+        <div class="more" @click="handleToMoreNews">{{ "更多 +" }}</div>
+      </div>
+    </div>
+    <div class="box3-main">
+      <div class="box3-item" v-for="(news, index) in newsList" :key="index" @click="handleToNewsAnalysis(news)">
+        <div class="left">
+          <img :src="news[props.img] ? news[props.img] : DefaultIconNews" alt="" />
+        </div>
+        <div class="right">
+          <div class="right-top">
+            <div class="title"><span class="text-inner">{{ news[props.title] }}</span></div>
+            <div class="time">{{ news[props.from] }}</div>
+          </div>
+          <div class="right-footer">{{ news[props.content] }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import DefaultIconNews from "@/assets/icons/default-icon-news.png";
+const props = defineProps({
+
+  // 新闻列表数据
+  newsList: {
+    type: Array,
+    default: () => []
+  },
+
+  img: {
+    type: String,
+    default: 'img'
+  },
+  title: {
+    type: String,
+    default: "title"
+  },
+  from: {
+    type: String,
+    default: "from"
+  },
+  content: {
+    type: String,
+    default: "content"
+  },
+
+});
+const emit = defineEmits(['item-click', 'more-click']);
+const handleToMoreNews = () => {
+  emit('more-click')
+};
+const handleToNewsAnalysis = (item, index) => {
+  emit('item-click', item, index)
+};
+</script>
+<style lang="scss" scoped>
+.box3 {
+  width: 792px !important;
+  height: 450px !important;
+  border-radius: 10px !important;
+  box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1) !important;
+  background: rgba(255, 255, 255, 1) !important;
+  display: flex !important;
+  flex-direction: column;
+  gap: 0 !important;
+  overflow: hidden;
+
+
+  .box3-header {
+    height: 48px !important;
+    border-bottom: 1px solid rgba(234, 236, 238, 1) !important;
+    margin: 0 !important;
+    display: flex !important;
+    justify-content: space-between !important;
+    position: relative !important;
+    width: 100%;
+    box-sizing: border-box;
+
+    .box3-header-left {
+      display: flex !important;
+
+      .box3-header-icon {
+        margin-left: 19px !important;
+        margin-top: 14px !important;
+        width: 24px !important;
+        height: 24px !important;
+
+        img {
+          width: 100% !important;
+          height: 100% !important;
+        }
+      }
+
+      .box3-header-title {
+        margin-top: 11px !important;
+        margin-left: 17px !important;
+        height: 26px !important;
+        color: var(--color-main-active) !important;
+        font-family: 'Source Han Sans CN' !important;
+        font-size: 20px !important;
+        font-weight: 700 !important;
+        line-height: 26px !important;
+      }
+    }
+
+    .more {
+      width: 45px;
+      height: 24px;
+      position: absolute;
+      top: 12px;
+      right: 27px;
+      color: rgba(20, 89, 187, 1);
+      font-family: 'Source Han Sans CN';
+      font-size: 16px;
+      font-weight: 400;
+      line-height: 24px;
+      cursor: pointer;
+    }
+  }
+
+  .box3-main {
+    height: 401px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 6px 0;
+
+    .box3-item {
+      display: flex;
+      height: 78px;
+      width: 749px;
+      margin-left: 21px;
+      border-bottom: 1px solid rgba(240, 242, 244, 1);
+      cursor: pointer;
+
+      &:hover {
+        .right-top .title {
+          color: rgb(5, 95, 194) !important;
+          font-weight: 700;
+        }
+
+        .right-top .text-inner {
+          border-bottom-color: rgb(5, 95, 194) !important;
+
+        }
+      }
+
+      .left {
+        width: 72px;
+        height: 48px;
+        margin-top: 15px;
+
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+
+      .right {
+        width: 657px;
+        margin-left: 20px;
+
+        .right-top {
+          width: 657px;
+          display: flex;
+          justify-content: space-between;
+
+          .title {
+            margin-top: 14px;
+            width: 500px;
+            height: 24px;
+            color: rgba(59, 65, 75, 1);
+            font-family: 'Source Han Sans CN';
+            font-size: 16px;
+            font-weight: 700;
+            line-height: 24px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
+            .text-inner {
+              border-bottom: 1px solid transparent;
+
+            }
+          }
+
+          .time {
+            width: 157px;
+            text-align: right;
+            height: 22px;
+            margin-top: 14px;
+            color: rgba(95, 101, 108, 1);
+            font-family: 'Source Han Sans CN';
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 22px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+
+        .right-footer {
+          width: 657px;
+          height: 24px;
+          color: rgba(59, 65, 75, 1);
+          font-family: 'Source Han Sans CN';
+          font-size: 16px;
+          font-weight: 400;
+          line-height: 24px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
--- a/src/components/NewsList/image1.png
+++ b/src/components/NewsList/image1.png
--- a/src/components/RiskSignal/RiskSignal.vue
+++ b/src/components/RiskSignal/RiskSignal.vue
+<template>
+  <div class="box2">
+    <div class="box2-header">
+      <div class="icon">
+        <img src="./image1.png" alt="" />
+      </div>
+      <div class="title">
+        <div class="text">{{ title }}</div>
+        <div class="num">{{ list.length }}</div>
+      </div>
+    </div>
+    <div class="box2-main">
+
+      <div class="box2-main-item" v-for="(item, index) in list" :key="index" @click="handleItemClick(item, index)">
+        <div :class="{
+          itemLeftStatus1: item[props.riskLevel] === '特别重大',
+          itemLeftStatus2: item[props.riskLevel] === '重大风险',
+          itemLeftStatus3: item[props.riskLevel] === '较大风险',
+          itemLeftStatus4: item[props.riskLevel] === '一般风险' || !item[props.riskLevel],
+          itemLeftStatus5: item[props.riskLevel] === '低风险',
+        }">
+          {{ item[props.riskLevel] || "暂无数据" }}
+        </div>
+        <div class="item-right">
+          <div class="text"> <span class="text-inner">{{ item[props.name] }}</span></div>
+          <div class="time">{{ item[props.postDate] }}</div>
+        </div>
+      </div>
+    </div>
+    <div class="box2-footer" @click="handleMoreClick" v-if="showMore">
+      <div class="icon">
+        <img src="./image2.png" alt="" />
+      </div>
+      <div class="text">{{ moreText }}</div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ElMessage } from "element-plus";
+// 接收父组件传递的参数
+const props = defineProps({
+  // 标题（默认“风险信号”）
+  title: {
+    type: String,
+    default: "风险信号"
+  },
+  // 风险信号列表数据
+  list: {
+    type: Array,
+    default: () => []
+  },
+  // “查看更多”文本（默认“查看更多”）
+  moreText: {
+    type: String,
+    default: "查看更多"
+  },
+  //控制“查看更多”是否显示，默认显示
+  showMore: {
+    type: Boolean,
+    default: true
+  },
+  name: {
+    type: String,
+    default: "name"
+  },
+  postDate: {
+    type: String,
+    default: "postDate"
+  },
+  riskLevel: {
+    type: String,
+    default: "riskLevel"
+  },
+
+});
+
+// 定义自定义事件，把点击事件传递给父组件
+const emit = defineEmits(['item-click', 'more-click']);
+
+// 点击单条风险信号
+const handleItemClick = (item, index) => {
+  emit('item-click', item, index)
+};
+
+// 点击“查看更多”
+const handleMoreClick = () => {
+
+  emit('more-click')
+};
+
+
+</script>
+
+<style scoped lang="scss">
+.risk-status-base {
+  width: 40px;
+  height: 40px;
+  border-radius: 20px;
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 14px;
+  box-sizing: border-box;
+  padding: 6px 4px;
+  text-align: center;
+}
+
+.itemLeftStatus1 {
+  color: rgb(206, 79, 81) !important;
+  background: rgba(255, 241, 240, 1) !important;
+  @extend .risk-status-base
+}
+
+.itemLeftStatus2 {
+  color: rgba(250, 140, 22, 1) !important;
+  background: rgba(255, 247, 230, 1) !important;
+  @extend .risk-status-base
+}
+
+.itemLeftStatus3 {
+  color: rgba(212, 177, 6, 1) !important;
+  background: rgba(254, 255, 230, 1) !important;
+  @extend .risk-status-base
+}
+
+.itemLeftStatus4 {
+  color: rgba(82, 196, 26, 1) !important;
+  background: rgba(246, 255, 237, 1) !important;
+  @extend .risk-status-base
+}
+
+.itemLeftStatus5 {
+  color: rgba(22, 119, 255, 1) !important;
+  background: rgba(230, 244, 255, 1) !important;
+  @extend .risk-status-base
+}
+
+
+.box2 {
+  width: 520px;
+  height: 450px;
+  border-radius: 10px;
+  position: relative;
+  background: rgba(255, 255, 255, 1);
+  padding: 0;
+  box-shadow: 0 0 20px 0 rgba(25, 69, 130, 0.1);
+  border: 1px solid rgba(234, 236, 238, 1);
+  box-sizing: border-box;
+  overflow: hidden;
+
+  .box2-header {
+    height: 48px;
+    display: flex;
+    border-bottom: 1px solid rgba(240, 242, 244, 1);
+
+    .icon {
+      width: 24px;
+      height: 24px;
+      margin-left: 18px;
+      margin-top: 14px;
+      margin-bottom: 10px;
+
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .title {
+      display: flex;
+      width: 148px;
+      background: rgb(206, 79, 81);
+      margin-left: 18px;
+
+      .text {
+        margin-left: 16px;
+        height: 48px;
+        color: rgba(255, 255, 255, 1);
+        font-family: 'Source Han Sans CN';
+        font-size: 20px;
+        font-weight: 700;
+        line-height: 48px;
+      }
+
+      .num {
+        width: 24px;
+        height: 20px;
+        line-height: 20px;
+        text-align: center;
+        color: rgba(255, 255, 255, 1);
+        font-family: Microsoft YaHei;
+        font-size: 12px;
+        margin-left: 15px;
+        margin-top: 15px;
+        border-radius: 100px;
+        background: rgba(255, 255, 255, 0.3);
+      }
+    }
+  }
+
+  .box2-main {
+    box-sizing: border-box;
+    padding-left: 23px;
+    padding-right: 30px;
+    overflow-y: auto;
+    width: 520px;
+    height: calc(100% - 160px);
+    border-radius: 4px;
+
+    .box2-main-item {
+      width: 463px;
+      height: 48px;
+      border-radius: 2px;
+      position: relative;
+      display: flex;
+      align-items: center;
+
+      cursor: pointer;
+
+      &:hover {
+
+
+        .item-right .text {
+          color: rgb(5, 95, 194) !important;
+          font-weight: 700;
+        }
+
+        .item-right .text-inner {
+          border-bottom-color: rgb(5, 95, 194) !important;
+
+        }
+      }
+
+
+
+
+
+
+      .item-left {
+        margin-top: 4px;
+        margin-left: 0px;
+        margin-bottom: 4px;
+        width: 40px;
+        height: 40px;
+        border-radius: 20px;
+        color: rgba(82, 196, 26, 1);
+        background: rgba(246, 255, 237, 1);
+        font-family: Microsoft YaHei;
+        font-size: 12px;
+        font-weight: 400;
+        line-height: 14px;
+        box-sizing: border-box;
+        padding: 6px 4px;
+        text-align: center;
+        flex-shrink: 0;
+      }
+
+      .item-right {
+        margin-left: 12px;
+        height: 46px;
+        display: flex;
+        align-items: center;
+        flex: 1;
+        background: transparent;
+        padding: 0;
+        border-bottom: 1px solid #EAECEE;
+        box-sizing: border-box;
+        overflow: hidden; // 保证右侧不会溢出
+
+        .text {
+          padding-top: 8px;
+          padding-bottom: 8px;
+          flex: 1 1 auto;
+          min-width: 0;
+          height: 100%;
+          background: transparent;
+          font-family: "Source Han Sans CN";
+          font-weight: 400;
+          font-size: 16px;
+          letter-spacing: 0px;
+          text-align: left;
+          color: rgb(59, 65, 75);
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          box-sizing: border-box;
+          flex-shrink: 1;
+
+          .text-inner {
+            border-bottom: 1px solid transparent;
+          }
+
+        }
+
+        .time {
+          flex: 0 0 auto;
+          margin-left: 12px;
+          padding-top: 11px;
+          padding-bottom: 11px;
+          height: 100%;
+          flex-shrink: 0;
+          background: transparent;
+          font-family: "Source Han Sans CN", sans-serif;
+          font-weight: 400;
+          font-size: 16px;
+          line-height: 24px;
+          letter-spacing: 0px;
+          text-align: right;
+          box-sizing: border-box;
+          color: rgb(132, 136, 142);
+          white-space: nowrap;
+        }
+      }
+
+    }
+  }
+
+  .box2-footer {
+    position: absolute;
+    left: 26px;
+    right: 20px;
+    bottom: 20px;
+    width: 460px;
+    height: 42px;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    border-radius: 6px;
+    background: var(--color-main-active);
+    cursor: pointer;
+
+    .icon {
+      width: 16px;
+      height: 16px;
+
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .text {
+      margin-left: 8px;
+      color: rgba(255, 255, 255, 1);
+      font-family: "Source Han Sans CN";
+      font-size: 16px;
+      font-weight: 400;
+      line-height: 24px;
+    }
+  }
+}
+</style>
\ No newline at end of file
--- a/src/components/RiskSignal/image1.png
+++ b/src/components/RiskSignal/image1.png
--- a/src/components/RiskSignal/image2.png
+++ b/src/components/RiskSignal/image2.png
--- a/src/views/bill/billHome/index.vue
+++ b/src/views/bill/billHome/index.vue
--- a/src/views/coopRestriction/components/askPage/index.vue
+++ b/src/views/coopRestriction/components/askPage/index.vue
--- a/src/views/coopRestriction/components/dataNew/index.vue
+++ b/src/views/coopRestriction/components/dataNew/index.vue
@@ -9,16 +9,8 @@
 				<div class="more" @click="handleClickToDetail">查看详情 ></div>
 			</div>

-			<el-carousel
-				ref="carouselRef"
-				height="412px"
-				direction="horizontal"
-				:autoplay="true"
-				:interval="5000"
-				arrow="never"
-				indicator-position="none"
-				@change="handleCarouselChange"
-			>
+			<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">
@@ -42,14 +34,9 @@
 										<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)"
-												>
+												<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>
@@ -92,7 +79,7 @@
 				</el-carousel-item>
 			</el-carousel>
 		</div>
-		<div class="right">
+		<!-- <div class="right">
 			<div class="right-top">
 				<img src="./assets/icon02.png" alt="" />
 				<div class="right-top-title">
@@ -102,10 +89,8 @@
 			</div>
 			<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 === '一般风险' }"
-					>
+					<div class="main-left"
+						:class="{ cl4: item.title === '特别重大', cl5: item.title === '重大风险', cl6: item.title === '一般风险' }">
 						{{ item.title }}
 					</div>
 					<div class="item-right">
@@ -122,11 +107,14 @@
 				<img src="./assets/btn.png" alt="" />
 				查看更多
 			</div>
-		</div>
+		</div> -->
+		<RiskSignal :list="riskSignals" @more-click="handleToMoreRiskSignal" postDate="time" name="content"
+			riskLevel="title" @item-click="handleClickToDetail" />
 	</div>
 </template>

 <script setup>
+import RiskSignal from "@/components/RiskSignal/RiskSignal.vue";
 import { ref, onMounted, computed } from "vue";
 import router from "@/router";
 import { getCoopRestrictionTrends, getCoopRestrictionSignals } from "@/api/coopRestriction/coopRestriction.js";
@@ -225,7 +213,7 @@ const handleToMoreRiskSignal = () => {

 onMounted(() => {
 	// 合作限制-最新动态数据-获取数据
-    getCoopRestrictionTrendsData();
+	getCoopRestrictionTrendsData();
 	// 合作限制-风险信号数据-获取数据
 	getCoopRestrictionSignalsData();
 });
@@ -236,11 +224,13 @@ onMounted(() => {
 	margin: 0;
 	padding: 0;
 }
+
 .data-new {
 	width: 1600px;
 	height: 460px;
 	display: flex;
 	justify-content: space-between;
+
 	.left {
 		width: 1064px;
 		height: 460px;
@@ -250,6 +240,7 @@ onMounted(() => {
 		border: 1px solid rgb(234, 236, 238);
 		box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 		position: relative;
+
 		.left-btn {
 			width: 24px;
 			height: 48px;
@@ -260,6 +251,7 @@ onMounted(() => {
 			z-index: 100;
 			pointer-events: auto;
 		}
+
 		.right-btn {
 			width: 24px;
 			height: 48px;
@@ -270,11 +262,13 @@ onMounted(() => {
 			z-index: 100;
 			pointer-events: auto;
 		}
+
 		.left-top {
 			width: 100%;
 			height: 48px;
 			position: relative;
 			border-bottom: 1px solid rgb(234, 236, 238);
+
 			img {
 				width: 18px;
 				height: 18px;
@@ -282,6 +276,7 @@ onMounted(() => {
 				top: 15px;
 				left: 23px;
 			}
+
 			.more {
 				position: absolute;
 				height: 48px;
@@ -295,6 +290,7 @@ onMounted(() => {
 				cursor: pointer;
 				z-index: 101;
 			}
+
 			.left-top-title {
 				margin-left: 60px;
 				width: 152px;
@@ -309,10 +305,12 @@ onMounted(() => {
 				padding: 11px 16px;
 			}
 		}
+
 		.carousel-item-content {
 			width: 100%;
 			height: 100%;
 		}
+
 		.left-center {
 			width: 967px;
 			height: 208px;
@@ -320,15 +318,19 @@ onMounted(() => {
 			margin-left: 62px;
 			border-bottom: 1px solid rgb(234, 236, 238);
 			position: relative;
+
 			img {
 				width: 148px;
 				height: 148px;
 				margin-right: 21px;
 			}
+
 			display: flex;
+
 			.left-center-main {
 				width: 439px;
 				height: 175px;
+
 				.left-center-main-title {
 					margin-left: 19px;
 					margin-bottom: 17px;
@@ -337,17 +339,21 @@ onMounted(() => {
 					font-family: "Microsoft YaHei";
 					color: rgb(5, 95, 194);
 				}
+
 				.left-center-main-ul {
 					width: 439px;
 					height: 132px;
+
 					ul {
 						list-style-position: inside;
+
 						li {
 							width: 100%;
 							min-height: 24px;
 							margin-bottom: 12px;
 							display: flex;
 							align-items: flex-start;
+
 							&::before {
 								content: "·";
 								font-size: 24px;
@@ -356,6 +362,7 @@ onMounted(() => {
 								margin-right: 16px;
 								color: rgb(59, 65, 75);
 							}
+
 							.ul-title {
 								flex-shrink: 0;
 								width: 120px;
@@ -365,6 +372,7 @@ onMounted(() => {
 								line-height: 24px;
 								color: rgb(59, 65, 75);
 							}
+
 							.ul-content {
 								flex: 1;
 								color: rgb(59, 65, 75);
@@ -373,12 +381,14 @@ onMounted(() => {
 								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;
@@ -389,16 +399,19 @@ onMounted(() => {
 								line-height: 18px;
 								white-space: nowrap;
 							}
+
 							.cl1 {
 								border-color: rgba(186, 224, 255, 1);
 								background-color: rgba(230, 244, 255, 1);
 								color: rgba(22, 119, 255, 1);
 							}
+
 							.cl2 {
 								border-color: rgba(255, 163, 158, 1);
 								background-color: rgba(255, 241, 240, 1);
 								color: rgba(245, 34, 45, 1);
 							}
+
 							.cl3 {
 								border-color: rgba(135, 232, 222, 1);
 								background-color: rgba(230, 255, 251, 1);
@@ -408,6 +421,7 @@ onMounted(() => {
 					}
 				}
 			}
+
 			.left-center-title {
 				padding: 3px 8px 5px;
 				height: 32px;
@@ -423,10 +437,13 @@ onMounted(() => {
 				top: -1px;
 			}
 		}
+
 		.left-bottom {
 			margin: 17px 0 0 62px;
+
 			ul {
 				list-style-position: inside;
+
 				.left-bottom-li {
 					font-size: 16px;
 					font-weight: 700;
@@ -436,6 +453,7 @@ onMounted(() => {
 					margin-bottom: 10px;
 					display: flex;
 					align-items: center;
+
 					&::before {
 						content: "·";
 						font-size: 24px;
@@ -446,6 +464,7 @@ onMounted(() => {
 					}
 				}
 			}
+
 			.left-bottom-content {
 				width: 943px;
 				margin-left: 22px;
@@ -457,6 +476,7 @@ onMounted(() => {
 			}
 		}
 	}
+
 	.right {
 		width: 520px;
 		height: 460px;
@@ -465,11 +485,13 @@ onMounted(() => {
 		border: 1px solid rgb(234, 236, 238);
 		box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 		position: relative;
+
 		.right-top {
 			width: 520px;
 			height: 48px;
 			border-bottom: 1px solid rgb(234, 236, 238);
 			position: relative;
+
 			img {
 				width: 21px;
 				height: 16.84px;
@@ -477,6 +499,7 @@ onMounted(() => {
 				top: 15.1px;
 				left: 19.5px;
 			}
+
 			.right-top-title {
 				padding: 11px 16px;
 				width: 148px;
@@ -489,6 +512,7 @@ onMounted(() => {
 				text-align: center;
 				color: #fff;
 				margin-left: 60px;
+
 				span {
 					display: inline-block;
 					width: 24px;
@@ -504,6 +528,7 @@ onMounted(() => {
 				}
 			}
 		}
+
 		.right-main {
 			width: 468px;
 			padding-right: 5px;
@@ -512,9 +537,11 @@ onMounted(() => {
 			display: flex;
 			align-items: center;
 			cursor: pointer;
+
 			&:hover {
 				background: var(--color-bg-hover);
 			}
+
 			.main-left {
 				width: 40px;
 				height: 40px;
@@ -527,24 +554,29 @@ onMounted(() => {
 				padding: 6px 4px;
 				text-align: center;
 			}
+
 			.cl4 {
 				background-color: rgba(255, 241, 240, 1);
 				color: rgb(206, 79, 81);
 			}
+
 			.cl5 {
 				background-color: rgba(255, 247, 230, 1);
 				color: rgba(250, 140, 22, 1);
 			}
+
 			.cl6 {
 				background-color: rgba(246, 255, 237, 1);
 				color: rgba(82, 196, 26, 1);
 			}
+
 			.item-right {
 				flex: 1;
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				overflow: hidden;
+
 				.main-center {
 					flex: 1;
 					height: 30px;
@@ -558,6 +590,7 @@ onMounted(() => {
 					white-space: nowrap;
 					text-overflow: ellipsis;
 				}
+
 				.main-right {
 					width: 100px;
 					height: 24px;
@@ -571,6 +604,7 @@ onMounted(() => {
 				}
 			}
 		}
+
 		.right-mainbtn {
 			width: 460px;
 			height: 42px;
@@ -584,11 +618,13 @@ onMounted(() => {
 			align-items: center;
 			justify-content: center;
 			cursor: pointer;
+
 			img {
 				width: 16px;
 				height: 16px;
 				margin-right: 8px;
 			}
+
 			font-size: 16px;
 			font-weight: 400;
 			font-family: "Microsoft YaHei";

--- a/src/views/decree/decreeHome/index.vue
+++ b/src/views/decree/decreeHome/index.vue
@@ -167,7 +167,7 @@
 							</el-carousel-item>
 						</el-carousel>
 					</div>
-					<div class="box2">
+					<!-- <div class="box2">
 						<div class="box2-header">
 							<div class="icon">
 								<img src="./assets/images/box2-header-icon.png" alt="" />
@@ -207,12 +207,48 @@
 							</div>
 							<div class="text">{{ "查看更多" }}</div>
 						</div>
-					</div>
+					</div> -->
+					<RiskSignal :list="warningList" @item-click="handleClickToDetail" @more-click="handleToMoreRiskSignal">
+					</RiskSignal>
 				</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">
+								<div class="box3-header-icon">
+									<img src="@/assets/images/box-header-icon/news-icon.png" alt="" />
+								</div>
+								<div class="box3-header-title">{{ "新闻资讯" }}</div>
+								<div class="more" @click="handleToMoreNews">{{ "更多 +" }}</div>
+							</div>
+						</div>
+						<div class="box3-main">
+							<div class="box3-item" v-for="(news, index) in newsList" :key="index" @click="handleToNewsAnalysis(news)">
+								<div class="left">
+									<img :src="news.img ? news.img : DefaultIconNews" alt="" />
+								</div>
+								<div class="right">
+									<div class="right-top">
+										<div class="title">{{ news.title }}</div>
+										<div class="time">{{ news.from }}</div>
+									</div>
+									<div class="right-footer">{{ news.content }}</div>
+									<!-- <el-popover effect="dark" :width="1000" :content="news.content" placement="top-start">
+										<template #reference>
+											<div class="right-footer">{{ news.content }}</div>
+										</template>
+</el-popover> --
+</div>
+</div>
+</div>
+</div> -->
+					<NewsList :newsList="newsList" @item-click="handleToNewsAnalysis" @more-click="handleToMoreNews" />
+>>>>>>> zz-dev
 					<div class="box4">
 						<div class="box4-header">
 							<div class="header-icon">
@@ -458,12 +494,16 @@
 							<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] }}月{{
@@ -523,6 +563,7 @@
 </template>

 <script setup>
+import NewsList from "@/components/NewsList/NewsList.vue";
 import { onMounted, ref, computed, watch, nextTick } from "vue";
 import router from "@/router";
 import HeaderMenu from "@/components/headerMenu.vue";
@@ -539,6 +580,7 @@ import {
 	getDecreehylyList,
 	getDecreeTypeList
 } from "@/api/decree/home";
+import RiskSignal from "@/components/RiskSignal/RiskSignal.vue";
 import { getPersonSummaryInfo } from "@/api/common/index";
 import { getNews, getSocialMedia } from "@/api/general/index";
 import MessageBubble from "@/components/dialog.vue";
@@ -589,6 +631,7 @@ import Message2 from "./assets/images/message-icon2.png";
 import Message3 from "./assets/images/message-icon3.png";
 import { ElMessage } from "element-plus";

+
 // 跳转行政机构主页
 const handleToInstitution = item => {
 	window.sessionStorage.setItem("curTabName", item.name);

--- a/src/views/exportControl/index.vue
+++ b/src/views/exportControl/index.vue
--- a/src/views/finance/index.vue
+++ b/src/views/finance/index.vue
--- a/src/views/innovationSubject/index.vue
+++ b/src/views/innovationSubject/index.vue
--- a/src/views/marketAccessRestrictions/marketAccessHome/index.vue
+++ b/src/views/marketAccessRestrictions/marketAccessHome/index.vue
--- a/src/views/ruleRestriction/components/askPage/index.vue
+++ b/src/views/ruleRestriction/components/askPage/index.vue
--- a/src/views/ruleRestriction/components/dataNew/index.vue
+++ b/src/views/ruleRestriction/components/dataNew/index.vue
--- a/src/views/scientificFunding/components/askPage/index.vue
+++ b/src/views/scientificFunding/components/askPage/index.vue
--- a/src/views/scientificFunding/components/dataNew/index.vue
+++ b/src/views/scientificFunding/components/dataNew/index.vue
--- a/src/views/technologyFigures/index.vue
+++ b/src/views/technologyFigures/index.vue
--- a/src/views/thinkTank copy/index copy.vue
+++ b/src/views/thinkTank copy/index copy.vue
--- a/src/views/thinkTank copy/index.vue
+++ b/src/views/thinkTank copy/index.vue
--- a/src/views/thinkTank/index.vue
+++ b/src/views/thinkTank/index.vue