合并分支 'dev_hhq' 到 'master'

src/views/ZMOverView/components/gameProfile/Timeline.vue

@@ -102,8 +102,8 @@ export default {
   display: flex;
   align-items: center;
   width: 100%;
-  padding: 0 40px;
-  width: 1500px;
+  /* padding: 0 40px; */
+  width: 1600px;
   overflow: auto;
 
 }
@@ -156,7 +156,7 @@ export default {
 
 .line {
   position: absolute;
-  left: 0;
+  left: 10px;
   right: 0;
   top: 50%;
   height: 6px;

src/views/ZMOverView/components/newRisk/WaveBall.vue

@@ -74,7 +74,7 @@ const makeOption = () => {
           const change = props.data.change;
           const unit = props.data.unit;
           if (change === 0) {
-            return `{num|${'无新增'}}`
+            return `{noChange|${'无新增'}}\n{b|共${props.data.count}${unit}}`
           }
           return `{num|${change}}{unit| ${unit}}\n{b|共${props.data.count}${unit}}`
         },
@@ -86,7 +86,7 @@ const makeOption = () => {
             padding: [-4, 0, 8, 0]
           },
           noChange: {
-            fontSize: 24,
+            fontSize: 20,
             fontWeight: 'bold',
             color: `${props.color[5]}`,
             padding: [0, 0, 8, 0]

src/views/ZMOverView/components/newRisk/index.vue

@@ -7,7 +7,7 @@
 					width: sections[index].waveBall.length === 2 ? '350px' : '503px',
 					background: section.background
 				}">
-					<img class="section-title" :src="`/public/icon/riskToday/title-` + (index + 1) + `.png`" />
+					<img class="section-title" :src="section.title" />
 					<div class="stats">
 						<div v-for="value in sections[index].waveBall">
 							<WaveBall :percent="value.percent" :data="value" :color="section.waterColor" :size="128" />
@@ -39,7 +39,8 @@
 					</div>
 				</div>
 				<div style="display: flex">
-					<div class="risk-signals">
+					<!-- 风险信号列表 -->
+					<div class="risk-signals" ref="riskSignalsRef">
 						<div class="risk-signals-item" v-for="(item, index) in warningList" :key="index"
 							@click="handleClickToDetailO(item)">
 							<div class="item-left" :class="{
@@ -70,7 +71,7 @@
 						<el-carousel ref="carouselRef" style="height: 443px; width: 664px" :autoplay="true" :interval="30000"
 							arrow="never" indicator-position="none" @change="handleCarouselChange">
 							<el-carousel-item v-for="(News, NewsIndex) in hotNewsList" :key="NewsIndex">
-								<div class="carousel-item">
+								<div class="carousel-item" @click="toDetaile(News.id, News.HotspotType)">
 									<div class="carousel-title">
 										<div>
 											<div class="title-text">
@@ -105,17 +106,21 @@
 
 <script setup>
 import { color } from "echarts";
-import { onMounted, ref, computed, onBeforeUnmount } from "vue";
+import { onMounted, ref, onUnmounted, onBeforeUnmount } from "vue";
 import WaveBall from "./WaveBall.vue";
-import { getBillRiskSignal } from "@/api/bill/billHome";
 import { getLatestRiskUpdates, getLatestRisks } from '@/api/zmOverview/risk/index.js'
+import router from "@/router/index";
+import icon1 from './icon/title-1.png'
+import icon2 from './icon/title-2.png'
+import icon3 from './icon/title-3.png'
+import icon4 from './icon/title-4.png'
 const sectionTab = [
 	{
 		textColor: "rgba(9, 88, 217, 1)",
 		background: "linear-gradient(180.00deg, rgba(9, 88, 217, 1),rgba(9, 88, 217, 0.5) 100%)",
 		borderColor: "rgba(186, 224, 255, 1)",
 		waterColor: ["#4E92F4", "#5993EE", "#8EB3ED", "#77A2EB", "#ffffff", "#ffffff"],
-		title: "政策法规"
+		title: icon1
 	},
 	{
 		textColor: "rgba(9, 88, 217, 1)",
@@ -123,7 +128,7 @@ const sectionTab = [
 
 		borderColor: "rgba(186, 224, 255, 1)",
 		waterColor: ["#4AB9BA", "#5DBFC1", "#86CCCF", "#8DD0D2", "#ffffff", "#ffffff"],
-		title: "出口管制"
+		title: icon2
 	},
 	{
 		textColor: "rgba(9, 88, 217, 1)",
@@ -131,7 +136,7 @@ const sectionTab = [
 
 		borderColor: "rgba(186, 224, 255, 1)",
 		waterColor: ["#EF797B", "#ED8C8E", "#EAB0B2", "#E7ABAC", "#ffffff", "#ffffff"],
-		title: "投融资限制"
+		title: icon3
 	},
 	{
 		textColor: "rgba(9, 88, 217, 1)",
@@ -139,7 +144,7 @@ const sectionTab = [
 
 		borderColor: "rgba(186, 224, 255, 1)",
 		waterColor: ["#EFA04F", "#EDA969", "#EABA8C", "#E7AF7A", "#ffffff", "#ffffff"],
-		title: "市场准入"
+		title: icon4
 	}
 ];
 // 模拟从后端获取的数据
@@ -367,7 +372,6 @@ const hotNewsList = ref([
 //最新风险信号
 const handleGetLatestRisks = async () => {
 	try {
-
 		const res = await getLatestRisks();
 		console.log("最新风险信号", res);
 		if (res.code === 200 && res.data) {
@@ -391,12 +395,86 @@ const handleCarouselChange = index => {
 	}
 };
 
+// 查看详情
+const handleClickToDetail = () => {
+	window.sessionStorage.setItem("billId", curBill.value.billId);
+	window.sessionStorage.setItem("curTabName", curBill.value.billName);
+	const route = router.resolve({
+		path: "/billLayout",
+		query: {
+			billId: curBill.value.billId
+		}
+	});
+	console.log(route);
+
+	window.open(route.href, "_blank");
+};
+// 查看详情 传递参数
+const handleClickToDetailO = item => {
+	window.sessionStorage.setItem("billId", item.billId);
+	window.sessionStorage.setItem("curTabName", item.name || item.signalTitle);
+	const route = router.resolve("/billLayout?billId=" + item.billId);
+	window.open(route.href, "_blank");
+};
 const handleToRiskManage = () => {
 	// 这里的路由路径请根据实际情况修改
 	// router.push('/riskSignalManage');
 	console.log('跳转到风险信号管理');
 };
 
+
+const toDetaile = (id, type) => {
+	if (type === '法案') {
+		let path = "/billLayout/bill/introduction";
+		let query = { billId: id };
+		const { href } = router.resolve({ path, query });
+		window.open(href, "_blank");
+	} else if (type === '政令') {
+		const route = router.resolve({
+			path: "/decreeLayout/overview/introduction",
+			query: {
+				id: id
+			}
+		});
+		window.open(route.href, "_blank");
+	} else if (type === '实体清单' || type === 'CCL') {
+		const route = router.resolve({
+			path: "/exportControl/singleSanction",
+			query: {
+				id: id
+			}
+		});
+		window.open(route.href, "_blank");
+	} else if (type === '337') {
+		const curRoute = router.resolve({
+			path: "/marketSingleCaseLayout/overview",
+			query: {
+				id: "337",
+				searchId: id
+			}
+		});
+		window.open(curRoute.href, "_blank");
+	} else if (type === '203') {
+		const curRoute = router.resolve({
+			path: "/marketSingleCaseLayout/overview",
+			query: {
+				id: "203",
+				searchId: id
+			}
+		});
+		window.open(curRoute.href, "_blank");
+	} else if (type === '301') {
+		const curRoute = router.resolve({
+			path: "/marketSingleCaseLayout/overview",
+			query: {
+				id: "301",
+				searchId: id
+			}
+		});
+		window.open(curRoute.href, "_blank");
+	}
+	//type=涉军企业和SDN未对接
+}
 const handleSwithCurNews = name => {
 	if (name === "left") {
 		carouselRef.value.prev();
@@ -404,12 +482,37 @@ const handleSwithCurNews = name => {
 		carouselRef.value.next();
 	}
 };
+
+const riskSignalsRef = ref(null); // 引用risk-signals容器
+
+let intervalId;
 onMounted(async () => {
 
 	await handleGetLatestRiskUpdates()
 	await handleGetLatestRisks()
 
-	console.log("页面加载完成，可以获取数据了");
+	const scrollInterval = 2000; // 每隔2秒滚动一次
+	let currentScroll = 0;
+
+	intervalId = setInterval(() => {
+		if (riskSignalsRef.value) {
+
+			const scrollHeight = riskSignalsRef.value.scrollHeight; // 内容总高度
+			const clientHeight = riskSignalsRef.value.clientHeight; // 可视区域高度
+			console.log(scrollHeight, clientHeight)
+			// 如果滚动到底，则回到顶部
+			if (currentScroll + clientHeight >= scrollHeight) {
+				currentScroll = 0;
+				riskSignalsRef.value.scrollTop = currentScroll;
+			} else {
+				currentScroll += 10; // 调整这个值可以改变滚动速度
+				riskSignalsRef.value.scrollTop = currentScroll;
+			}
+		}
+	}, scrollInterval);
+});
+onUnmounted(() => {
+	clearInterval(intervalId); // 清除定时器
 });
 // onBeforeUnmount(() => {
 // 	andleGetLatestRiskUpdates()
@@ -785,32 +888,29 @@ onMounted(async () => {
 				.title-text {
 					/* 美国白宫发布关于进一步延长TikTok执法宽限期的行政令 */
 					width: 547px;
-					height: 26px;
+					// height: 26px;
 				}
 
 				.title-tag {
-					/* 容器 1563 */
-					width: 190px;
+					/* 移除固定 width */
 					height: 30px;
-					margin-top: 12px;
-					/* 自动布局 */
-					display: flex;
-					flex-direction: row;
-					justify-content: flex-start;
-					align-items: flex-start;
-					gap: 10;
-					padding: 0px 12px 0px 12px;
+					padding: 0 12px;
+					/* 左右内边距控制最小宽度 */
+					display: inline-flex;
+					/* ✅ 关键：inline + flex */
+					justify-content: center;
+					/* 水平居中 */
+					align-items: center;
+					/* 垂直居中 */
 					border-radius: 20px;
 					background: rgba(206, 79, 81, 0.1);
 					color: rgba(206, 79, 81, 1);
-
 					font-family: Microsoft YaHei;
-					font-style: Regular;
 					font-size: 16px;
 					font-weight: 400;
-					line-height: 30px;
-					letter-spacing: 0px;
-					text-align: justify;
+					white-space: nowrap;
+					/* 防止文字换行 */
+					box-sizing: border-box;
 				}
 			}