update

src/App.vue

 <template>
 	<div id="app">
 		<div class="pro-wrapper">
-			<div class="home-page" v-if="isCurrentOverview">
+			<div class="home-page">
 				<div class="navbar">
 					<div class="nav-left">
 						<div class="icon">
@@ -55,7 +55,7 @@
 					<router-view />
 				</div>
 			</div>
-			<div class="content-page" v-if="!isCurrentOverview">
+			<!-- <div class="content-page" v-if="!isCurrentOverview">
 				<div class="navbar">
 					<div class="nav-brand">
 						<div class="brand-icon">
@@ -78,7 +78,7 @@
 				<div class="main-container">
 					<router-view />
 				</div>
-			</div>
+			</div> -->
 
 			<div class="right-btn" aria-disabled="true">
 				<div class="item">

src/views/ZMOverView/components/fourSuppress/components/addDomain/index.vue

@@ -2,7 +2,7 @@
 
 <template>
 	<div class="content-wrapper">
-		<div class="btn-wrapper" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay">
+		<div class="btn-wrapper" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay(true)">
 			<div class="cards-mask">
 				<div class="btn-box" :style="{ transform: `translateX(-${currentIndex * (307 + 16)}px)` }">
 					<div class="btn-item-outer" v-for="(item, indexx) in buttonsData" :key="indexx">
@@ -1020,8 +1020,11 @@ watch(selectedField, handleGetDomainContainmentRanking);
 const currentIndex = ref(0);
 let autoTimer = null;
 
-const startAutoPlay = () => {
+const startAutoPlay = isContiune => {
+	if (!isContiune) {
 		currentIndex.value = 0;
+	}
+
 	stopAutoPlay();
 	if (buttonsData.value.length > 5) {
 		autoTimer = setInterval(() => {

src/views/ZMOverView/components/fourSuppress/components/allElement/index.vue

 <template>
 	<div class="content-wrapper">
-		<div class="header" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay">
+		<div class="header" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay(true)">
 			<div class="header-arrow-left" @click="prev">
 				<img src="../../assets/left-btn.png" alt="" />
 			</div>
@@ -459,8 +459,10 @@ const handleBox3Chart = async () => {
 const currentIndex = ref(0);
 let autoTimer = null;
 
-const startAutoPlay = () => {
+const startAutoPlay = (isContiune) => {
+	if(!isContiune) {
 		currentIndex.value = 0
+	}
 	stopAutoPlay();
 	if (headerList.value.length >= 5) {
 		autoTimer = setInterval(() => {
@@ -496,7 +498,6 @@ const prev = () => {
 };
 
 watch(activeDate, async () => {
-	// currentIndex.value = 0
 	handleGetBox2DataList(); // 美对我要素打压情况
 	handleGetBox3DataList(); // 美自身要素发展情况
 	handleBox2Chart(); // 关键词云-上

src/views/ZMOverView/components/fourSuppress/components/allGovernment/index.vue

 <!--科技要闻-->
 <template>
 	<div class="content-wrapper">
-		<div class="main-content" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay">
+		<div class="main-content" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay(true)">
 			<div class="cards-mask">
 				<div class="cards-container" :style="{ transform: `translateX(-${currentIndex * (307 + 16)}px)` }">
 					<div v-for="(card, index) in cardList" :key="index" class="government-card" @click="handleCardClick(card)">
@@ -627,8 +627,10 @@ const cardList = ref([
 const currentIndex = ref(0);
 let autoTimer = null;
 
-const startAutoPlay = () => {
+const startAutoPlay = isContinue => {
+	if (!isContinue) {
 		currentIndex.value = 0;
+	}
 	stopAutoPlay();
 	if (cardList.value.length > 5) {
 		autoTimer = setInterval(() => {

src/views/ZMOverView/components/fourSuppress/components/allUnion/index.vue

@@ -2,7 +2,7 @@
 <template>
 	<div class="content-wrapper">
 		<!-- 轮播栏目 -->
-		<div class="carousel-list" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay">
+		<div class="carousel-list" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay(true)">
 			<img src="./assets/leftbtn.png" alt class="left-btn" @click="prev" :class="{ disabled: startIndex === 0 }" />
 			<div class="content">
 				<div class="carousel-container" :style="{ transform: `translateX(-${startIndex * (307 + 16)}px)` }">
@@ -172,8 +172,11 @@ const activeDate = inject("activeDate", ref("week"));
 // 自动轮播定时器
 let autoTimer = null;
 
-const startAutoPlay = () => {
+const startAutoPlay = isContinue => {
+	if (!isContinue) {
 		startIndex.value = 0;
+	}
+
 	stopAutoPlay();
 	if (carouselList.value.length > 5) {
 		autoTimer = setInterval(() => {
@@ -903,6 +906,7 @@ watch(activeDate, async () => {
 	// fetchGeoJSON();
 	// initLeftDonut();
 	// initRightDonut();
+	startAutoPlay();
 });
 </script>
 

src/views/bill/billHome/index.vue

@@ -43,14 +43,14 @@
 			</div>
 		</div>
 		<div class="home-box" :class="{ scrollHomeBox: isShow }" ref="containerRef">
-			<div class="home-header" v-show="!isShow">
+			<!-- <div class="home-header" v-show="!isShow">
 				<div class="header-left">
 					<HeaderMenu></HeaderMenu>
 				</div>
 				<div class="header-right">
 					<headerInfo curTitleName="科技法案"></headerInfo>
 				</div>
-			</div>
+			</div> -->
 			<div class="home-main">
 				<div class="home-main-header" v-show="!isShow">
 					<div class="home-main-header-center">

src/views/coopRestriction/index.vue

@@ -40,14 +40,14 @@
 		</div>
 
 		<!-- 面包屑 -->
-		<div class="breadcrumb" v-show="!isShow">
+		<!-- <div class="breadcrumb" v-show="!isShow">
 			<div class="header-left">
 				<HeaderMenu></HeaderMenu>
 			</div>
 			<div class="header-right">
 				<headerInfo curTitleName="合作限制"></headerInfo>
 			</div>
-		</div>
+		</div> -->
 		<!-- 主页面 -->
 		<div class="main-content" ref="homeMainRef" :class="{ 'scroll-main': isShow }">
 			<!-- 搜索栏部分 -->
@@ -180,7 +180,6 @@ const handleToPosi = id => {
 		});
 	}
 };
-
 </script>
 
 <style scoped lang="scss">
@@ -191,20 +190,22 @@ const handleToPosi = id => {
 .coop-page {
 	width: 100%;
 	height: 100%;
-	.breadcrumb {
-		width: 100%;
-		height: 64px;
-		background-image: url("./assets/images/bread-bg.png");
-		background-size: cover;
-		padding: 0 160px;
-		display: flex;
-		justify-content: space-between;
-	}
+	// .breadcrumb {
+	// 	width: 100%;
+	// 	height: 64px;
+	// 	background-image: url("./assets/images/bread-bg.png");
+	// 	background-size: cover;
+	// 	padding: 0 160px;
+	// 	display: flex;
+	// 	justify-content: space-between;
+	// }
+
 	.main-content {
 		position: relative;
-		overflow: auto;
+		overflow: hidden;
+		overflow-y: auto;
 		width: 100%;
-		height: calc(100% - 64px);
+		height: 100%;
 		background: url("./assets/images/background.png");
 		background-size: 100% 100%;
 		padding: 44px 160px 30px 160px;

src/views/decree/decreeHome/index.vue

@@ -44,14 +44,14 @@
 		</div>
 		<div class="home-main" :class="{ scrollHomeMain: isShow }" ref="containerRef">
 			<div class="home-main-header">
-				<div class="home-main-header-top" v-show="!isShow">
+				<!-- <div class="home-main-header-top" v-show="!isShow">
 					<div class="header-left">
 						<HeaderMenu></HeaderMenu>
 					</div>
 					<div class="header-right">
 						<headerInfo curTitleName="政令"></headerInfo>
 					</div>
-				</div>
+				</div> -->
 				<div class="home-main-header-center" v-show="!isShow">
 					<el-input
 						v-model="searchDecreeText"

src/views/exportControl/index.vue

@@ -37,14 +37,14 @@
 				</div>
 			</div>
 		</div>
-		<div class="home-header" v-show="!isShow">
+		<!-- <div class="home-header" v-show="!isShow">
 			<div class="header-left">
 				<HeaderMenu></HeaderMenu>
 			</div>
 			<div class="header-right">
 				<headerInfo curTitleName="出口管制"></headerInfo>
 			</div>
-		</div>
+		</div> -->
 		<div class="home-main" ref="homeMainRef" :class="{ 'scroll-main': isShow }">
 			<div class="home-main-header">
 				<div class="home-main-header-center" v-show="!isShow">

src/views/finance/index.vue

 <template>
 	<div class="home-wrapper">
-		<div class="home-header">
+		<!-- <div class="home-header">
 			<div class="header-left">
 				<HeaderMenu></HeaderMenu>
 			</div>
 			<div class="header-right">
 				<headerInfo curTitleName="投融资限制"></headerInfo>
 			</div>
-		</div>
+		</div> -->
 		<div class="home-main">
 			<div class="home-main-header">
 				<div class="home-main-header-center">

src/views/marketAccessRestrictions/marketAccessHome/index.vue

@@ -2,14 +2,14 @@
 	<div class="home-wrapper">
 		<div class="home-main">
 			<div class="home-main-header">
-				<div class="home-main-header-top">
+				<!-- <div class="home-main-header-top">
 					<div class="header-left">
 						<HeaderMenu></HeaderMenu>
 					</div>
 					<div class="header-right">
 						<headerInfo curTitleName="市场准入限制"></headerInfo>
 					</div>
-				</div>
+				</div> -->
 				<div class="home-main-header-center">
 					<el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索市场准入限制调查" />
 					<div class="search">

src/views/ruleRestriction/index.vue

@@ -40,14 +40,14 @@
 		</div>
 
 		<!-- 面包屑 -->
-		<div class="breadcrumb" v-show="!isShow">
+		<!-- <div class="breadcrumb" v-show="!isShow">
 			<div class="header-left">
 				<HeaderMenu></HeaderMenu>
 			</div>
 			<div class="header-right">
 				<headerInfo curTitleName="规则限制"></headerInfo>
 			</div>
-		</div>
+		</div> -->
 		<!-- 主页面 -->
 		<div class="main-content" ref="homeMainRef" :class="{ 'scroll-main': isShow }">
 			<!-- 搜索栏部分 -->
@@ -219,20 +219,21 @@ onMounted(async () => {
 .coop-page {
 	width: 100%;
 	height: 100%;
-	.breadcrumb {
-		width: 100%;
-		height: 64px;
-		background-image: url("./assets/images/bread-bg.png");
-		background-size: cover;
-		display: flex;
-		justify-content: space-between;
-		padding: 0 160px;
-	}
+	// .breadcrumb {
+	// 	width: 100%;
+	// 	height: 64px;
+	// 	background-image: url("./assets/images/bread-bg.png");
+	// 	background-size: cover;
+	// 	display: flex;
+	// 	justify-content: space-between;
+	// 	padding: 0 160px;
+	// }
 	.main-content {
 		position: relative;
-		overflow: auto;
+		overflow: hidden;
+		overflow-y: auto;
 		width: 100%;
-		height: calc(100% - 64px);
+		height: 100%;
 		background: url("./assets/images/background.png");
 		background-size: 100% 100%;
 		padding: 44px 160px 30px 160px;

src/views/scientificFunding/index.vue

@@ -2,14 +2,14 @@
 <template>
 	<div class="coop-page">
 		<!-- 面包屑 -->
-		<div class="breadcrumb">
+		<!-- <div class="breadcrumb">
 			<div class="header-left">
 				<HeaderMenu></HeaderMenu>
 			</div>
 			<div class="header-right">
 				<headerInfo curTitleName="科研资助体系"></headerInfo>
 			</div>
-		</div>
+		</div> -->
 		<!-- 主页面 -->
 		<div class="main-content">
 			<!-- 搜索栏部分 -->
@@ -237,20 +237,21 @@ onMounted(async () => {
 	width: 100%;
 	height: 100%;
 
-	.breadcrumb {
-		width: 100%;
-		height: 64px;
-		background-image: url("./assets/images/bread-bg.png");
-		background-size: cover;
-		display: flex;
-		justify-content: space-between;
-		padding: 0 160px;
-	}
+	// .breadcrumb {
+	// 	width: 100%;
+	// 	height: 64px;
+	// 	background-image: url("./assets/images/bread-bg.png");
+	// 	background-size: cover;
+	// 	display: flex;
+	// 	justify-content: space-between;
+	// 	padding: 0 160px;
+	// }
 
 	.main-content {
-		overflow: auto;
+		overflow: hidden;
+		overflow-y: auto;
 		width: 100%;
-		height: calc(100% - 64px);
+		height: 100%;
 		background: url("./assets/images/background.png");
 		background-size: 100% 100%;
 		padding: 44px 160px 30px 160px;

src/views/technologyFigures/index.vue

@@ -38,13 +38,13 @@
 			</div>
 		</div>
 		<div class="home-box" :class="{ scrollHomeBox: isShow }" ref="containerRef">
-			<div class="home-header" v-show="!isShow">
+			<!-- <div class="home-header" v-show="!isShow">
 				<div class="header-item">国家科技安全</div>
 				<div class="header-item">></div>
 				<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div>
 				<div class="header-item">></div>
 				<div class="header-item">科技人物观点</div>
-			</div>
+			</div> -->
 			<div class="home-main">
 				<div class="home-main-header" v-show="!isShow">
 					<!-- <div class="home-main-header-top">
@@ -1103,7 +1103,7 @@ onMounted(async () => {
 	}
 	.scrollHomeBox {
 		width: 100%;
-		height: calc(100% - 144px);
+		height: calc(100% - 64px);
 		overflow-y: auto;
 	}
 	.home-box {
@@ -1112,43 +1112,32 @@ onMounted(async () => {
 		background: url("./assets/images/background.png");
 		background-size: 100% 100%;
 		overflow-y: auto;
-		.home-header {
-			height: 64px;
-			color: #fff;
-			font-family: Microsoft YaHei;
-			font-size: 20px;
-			font-weight: 700;
-			line-height: 26px;
-			line-height: 64px;
-			background: url("./assets/images/header-bg.png");
-			box-sizing: border-box;
-			padding-left: 160px;
-			display: flex;
-			.header-item {
-				margin: 0 3px;
-			}
-			.back-item {
-				cursor: pointer;
-				&:hover {
-					color: #ccc;
-				}
-			}
-		}
+		// .home-header {
+		// 	height: 64px;
+		// 	color: #fff;
+		// 	font-family: Microsoft YaHei;
+		// 	font-size: 20px;
+		// 	font-weight: 700;
+		// 	line-height: 26px;
+		// 	line-height: 64px;
+		// 	background: url("./assets/images/header-bg.png");
+		// 	box-sizing: border-box;
+		// 	padding-left: 160px;
+		// 	display: flex;
+		// 	.header-item {
+		// 		margin: 0 3px;
+		// 	}
+		// 	.back-item {
+		// 		cursor: pointer;
+		// 		&:hover {
+		// 			color: #ccc;
+		// 		}
+		// 	}
+		// }
 		.home-main {
-			// width: 1920px;
-			// margin: 0 auto;
-			// background: url("./assets/images/background.png");
-			// background-repeat: no-repeat;
-			// background-color: #fff;
-			// background-size: contain;
-			// width: 100%;
-			// height: 100%;
-			// overflow-y: auto;
-			// background: url("./assets/images/background.png");
-			// background-size: 100% 100%;
 			width: 1600px;
 			margin: 0 auto;
-			margin-top: 48px;
+			// margin-top: 48px;
 
 			.home-main-header {
 				display: flex;

src/views/thinkTank/index.vue

@@ -44,14 +44,14 @@
 		</div>
 		<div class="home-main" :class="{ scrollHomeMain: isShow }" ref="containerRef">
 			<div class="home-main-header">
-				<div class="home-main-header-top" v-show="!isShow">
+				<!-- <div class="home-main-header-top" v-show="!isShow">
 					<div class="header-left">
 						<HeaderMenu></HeaderMenu>
 					</div>
 					<div class="header-right">
 						<headerInfo curTitleName="科技智库"></headerInfo>
 					</div>
-				</div>
+				</div> -->
 				<div class="home-main-header-center" v-show="!isShow">
 					<el-input
 						v-model="searchThinktankText"