update

src/views/bill/billHome/index.vue

@@ -130,7 +130,7 @@
 									{{ "查看详情 >" }}
 								</div>
 							</div>
-							<div class="box1-main" style="display: block;">
+							<div class="box1-main" style="display: block">
 								<el-carousel
 									ref="carouselRef"
 									height="354px"
@@ -141,7 +141,7 @@
 									@change="handleCarouselChange"
 								>
 									<el-carousel-item v-for="(bill, billIndex) in hotBillList" :key="billIndex">
-										<div class="carousel-content" style="display: flex; height: 100%;">
+										<div class="carousel-content" style="display: flex; height: 100%">
 											<div class="box1-main-left">
 												<div class="box1-main-left-title">
 													<!-- "H.R.1(119th)-大而美法案" -->
@@ -292,7 +292,7 @@
 							</div>
 							<div class="box4-main">
 								<div class="box4-main-item" v-for="(item, index) in messageList" :key="index">
-									<div class="left" @click="handleClcikToCharacter(item,index)">
+									<div class="left" @click="handleClcikToCharacter(item, index)">
 										<img :src="item.personImage" alt="" />
 									</div>
 									<div class="right">
@@ -439,7 +439,7 @@
 									class="box8-main-item"
 									v-for="(item, index) in box8Data"
 									:key="index"
-									@click="handleClcikToCharacter(item,index)"
+									@click="handleClcikToCharacter(item, index)"
 								>
 									<div class="box8-main-item-left">
 										<img :src="item.img" alt="" referrerpolicy="no-referrer" class="left-img" />
@@ -641,16 +641,21 @@
 							</div>
 						</div>
 						<div class="right-main" v-loading="loading">
-<<<<<<< HEAD
-							<div class="right-main-box" v-for="(item, index) in bills" :key="index" @click="handleClickToDetailO(item)">
-=======
+							<<<<<<< HEAD
+							<div
+								class="right-main-box"
+								v-for="(item, index) in bills"
+								:key="index"
+								@click="handleClickToDetailO(item)"
+							>
+								=======
 								<div
 									class="right-main-box"
 									v-for="(item, index) in bills"
 									:key="index"
 									@click="handleClickToDetail()"
 								>
->>>>>>> e641835b10377b442772bb20faa9c6a12d09b494
+									>>>>>>> e641835b10377b442772bb20faa9c6a12d09b494
 									<div class="header">
 										<div class="title">{{ item.name }}</div>
 										<div class="en-title">{{ item.eName }}</div>
@@ -701,6 +706,7 @@
 				</div>
 			</div>
 		</div>
+	</div>
 </template>
 
 <script setup>
@@ -790,7 +796,7 @@ const formatMessageTime = timeStr => {
 };
 
 // 跳转人物主页
-const handleClcikToCharacter = (item,index) => {
+const handleClcikToCharacter = (item, index) => {
 	window.sessionStorage.setItem("memberId", item.memberId);
 	let type;
 	if (index === 0) {
@@ -830,7 +836,7 @@ const hotBillList = ref([]); // 热门法案列表
 const curHotBillListIndex = ref(0); // 当前热门法案索引
 const carouselRef = ref(null);
 
-const handleCarouselChange = (index) => {
+const handleCarouselChange = index => {
 	curHotBillListIndex.value = index;
 	if (hotBillList.value && hotBillList.value.length > 0) {
 		curBill.value = hotBillList.value[index];
@@ -863,7 +869,7 @@ const handleClickToDetail = () => {
 	window.open(route.href, "_blank");
 };
 // 查看详情 传递参数
-const handleClickToDetailO = (item) => {
+const handleClickToDetailO = item => {
 	window.sessionStorage.setItem("billId", item.billId);
 	const route = router.resolve("/billLayout");
 	window.open(route.href, "_blank");

src/views/decree/decreeHome/index.vue

@@ -116,16 +116,16 @@
 			<div class="home-main-center">
 				<div class="center-top">
 					<div class="box1">
-						<!-- <div class="box1-left">
+						<div class="box1-left" @click="handleSwithCurDecree('left')">
 							<div class="icon">
 								<img src="./assets/images/box1-left.png" alt="" />
 							</div>
 						</div>
-						<div class="box1-right">
+						<div class="box1-right" @click="handleSwithCurDecree('right')">
 							<div class="icon">
 								<img src="./assets/images/box1-right.png" alt="" />
 							</div>
-						</div> -->
+						</div>
 						<div class="box1-header">
 							<div class="box1-header-left">
 								<div class="icon">
@@ -137,7 +137,15 @@
 								{{ "查看详情 >" }}
 							</div>
 						</div>
-						<el-carousel ref="carouselRef" trigger="click" height="395px" :autoplay="true">
+						<el-carousel
+							ref="carouselRef"
+							height="395px"
+							:autoplay="true"
+							:interval="3000"
+							arrow="never"
+							indicator-position="none"
+							@change="handleCarouselChange"
+						>
 							<el-carousel-item v-for="(item, index) in box1DataList" :key="index">
 								<div class="box1-main">
 									<div class="box1-main-left">
@@ -1116,6 +1124,15 @@ watch(
 	}
 );
 
+// 切换当前政令
+const handleSwithCurDecree = name => {
+	if (name === "left") {
+		carouselRef.value.prev();
+	} else {
+		carouselRef.value.next();
+	}
+};
+
 onMounted(async () => {
 	handleGetAreaList();
 	handleGetDecreeOrderList();
@@ -1452,6 +1469,7 @@ onMounted(async () => {
 					position: relative;
 					.box1-left {
 						position: absolute;
+						z-index: 9999;
 						left: 0;
 						top: 200px;
 						width: 24px;
@@ -1472,6 +1490,7 @@ onMounted(async () => {
 					}
 					.box1-right {
 						position: absolute;
+						z-index: 9999;
 						right: 0;
 						top: 200px;
 						width: 24px;

src/views/exportControl/index.vue

@@ -91,7 +91,24 @@
 
 						<template #default>
 							<div class="box1">
-								<el-carousel ref="carouselRef" trigger="click" height="350px" :autoplay="true">
+								<div class="box1-left-arrow" @click="handleSwithCurPolicy('left')">
+									<div class="icon">
+										<img src="./assets/images/box1-left.png" alt="" />
+									</div>
+								</div>
+								<div class="box1-right-arrow" @click="handleSwithCurPolicy('right')">
+									<div class="icon">
+										<img src="./assets/images/box1-right.png" alt="" />
+									</div>
+								</div>
+								<el-carousel
+									ref="carouselRef"
+									height="350px"
+									:autoplay="true"
+									:interval="3000"
+									arrow="never"
+									indicator-position="none"
+								>
 									<el-carousel-item v-for="(item, index) in entitiesDataInfoList" :key="item.id + index">
 										<div>
 											<div class="box1-top">
@@ -730,7 +747,7 @@ const newsList = ref([]);
 
 onMounted(async () => {
 	try {
-		const [dataCount, entitiesDataInfo, industryCountByYear,cclList, countDomainByYear] = await Promise.all([
+		const [dataCount, entitiesDataInfo, industryCountByYear, cclList, countDomainByYear] = await Promise.all([
 			getEntitiesDataCount(),
 			getEntitiesDataInfo(),
 			getIndustryCountByYear(1),
@@ -1459,6 +1476,15 @@ const handleNewsInfoClick = item => {
 	window.open(route.href, "_blank");
 };
 
+// 切换当前出口管制政策
+const handleSwithCurPolicy = name => {
+	if (name === "left") {
+		carouselRef.value.prev();
+	} else {
+		carouselRef.value.next();
+	}
+};
+
 onMounted(async () => {
 	handleGetHylyList();
 	let chart1 = getMultiLineChart(chart1Data.value.title, chart1Data.value.data[0].value, chart1Data.value.data[1].value);
@@ -1521,6 +1547,48 @@ const handleMediaClick = item => {
 	flex-direction: column;
 	gap: 20px;
 	position: relative;
+	.box1-left-arrow {
+		position: absolute;
+		z-index: 9999;
+		left: -20px;
+		top: 135px;
+		width: 24px !important;
+		height: 48px;
+		background: #e7f1ff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		cursor: pointer;
+		.icon {
+			width: 11px;
+			height: 18px;
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	.box1-right-arrow {
+		position: absolute;
+		z-index: 9999;
+		right: -20px;
+		top:135px;
+		width: 24px;
+		height: 48px;
+		background: #e7f1ff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		cursor: pointer;
+		.icon {
+			width: 11px;
+			height: 18px;
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
 	.box1-absolute {
 		position: absolute;
 		width: 240px;
@@ -2062,44 +2130,9 @@ const handleMediaClick = item => {
 				gap: 20px;
 				.box1 {
 					display: flex;
-
 					gap: 10px;
 					position: relative;
-					// .box1-left {
-					//   position: absolute;
-					//   left: 0;
-					//   top: 200px;
-					//   width: 24px;
-					//   height: 48px;
-					//   background: #e7f1ff;
-					//   display: flex;
-					//   justify-content: center;
-					//   align-items: center;
-					//   cursor: pointer;
-					//   .icon {
-					//     width: 11px;
-					//     height: 18px;
-					//     img {
-					//       width: 100%;
-					//       height: 100%;
-					//     }
-					//   }
-					// }
-					.box1-right {
-						display: flex;
-						justify-content: center;
-						flex-direction: column;
-						align-items: center;
-						cursor: pointer;
-						.icon {
-							width: 11px;
-							height: 18px;
-							img {
-								width: 100%;
-								height: 100%;
-							}
-						}
-					}
+
 					.box1-header {
 						height: 53px;
 						border-bottom: 1px solid rgba(240, 242, 244, 1);