Merge branch 'master' into yp-dev

src/views/decree/decreeHome/index.vue

@@ -106,7 +106,7 @@
 				<div class="home-main-header-item-box">
 					<div class="item" v-for="(item, index) in govInsList" :key="index" @click="handleToInstitution(item)">
 						<div class="item-left">
-							<img :src="item.img?item.img: DefaultIcon2" alt="" />
+							<img :src="item.img ? item.img : DefaultIcon2" alt="" />
 						</div>
 						<div class="item-right">{{ item.name }}</div>
 					</div>
@@ -335,7 +335,6 @@
 				<DivideHeader id="position4" class="divide4" :titleText="'资源库'"></DivideHeader>
 				<div class="home-main-footer-header">
 					<div class="btn-box">
-
 						<div
 							class="btn"
 							:class="{ btnActive: activeCate === cate.id }"
@@ -345,7 +344,6 @@
 						>
 							{{ cate.name }}
 						</div>
-
 					</div>
 					<div class="select-box">
 						<div class="paixu-btn" @click="handleSwithSort">
@@ -375,6 +373,7 @@
 										:key="time.id"
 										v-model="activePubTime"
 										:label="time.id"
+										style="width: 100px"
 										class="filter-checkbox"
 									>
 										{{ time.name }}
@@ -414,13 +413,13 @@
 								class="main-item"
 								v-for="(item, index) in curDecreeList"
 								:key="index"
-								@click="handleClickToDetail"
+								@click="handleClickDecree(item)"
 							>
 								<div class="main-item-left">
 									<div class="left-left">{{ item.time }}</div>
 									<div class="left-right">
 										<div class="icon">
-											<img :src="item.orgImage?item.orgImage:DefaultIcon2" alt="">
+											<img :src="item.orgImage ? item.orgImage : DefaultIcon2" alt="" />
 										</div>
 										<div class="line" v-if="index !== 9 && index !== totalDecreesNum - 1"></div>
 									</div>
@@ -497,8 +496,8 @@ import getCalendarHeatChart from "./utils/cleandarHeat";
 
 import setChart from "@/utils/setChart";
 
-import DefaultIcon1 from '@/assets/icons/default-icon1.png'
-import DefaultIcon2 from '@/assets/icons/default-icon2.png'
+import DefaultIcon1 from "@/assets/icons/default-icon1.png";
+import DefaultIcon2 from "@/assets/icons/default-icon2.png";
 
 import p1 from "./assets/images/iconp1.png";
 import p2 from "./assets/images/iconp2.png";
@@ -534,10 +533,8 @@ import Message3 from "./assets/images/message-icon3.png";
 
 // 跳转行政机构主页
 const handleToInstitution = item => {
-	if (item.name === "美国商务部") {
 	const curRoute = router.resolve("/institution");
 	window.open(curRoute.href, "_blank");
-	}
 };
 
 // 返回首页
@@ -689,6 +686,17 @@ const handleClickToDetail = () => {
 	window.open(route.href, "_blank");
 };
 
+// 点击政令库政令
+const handleClickDecree = decree => {
+	const route = router.resolve({
+		path: "/decreeLayout",
+		query: {
+			id: decree.id
+		}
+	});
+	window.open(route.href, "_blank");
+};
+
 // 风险信号
 const warningList = ref([
 	{
@@ -780,7 +788,6 @@ const messageList = ref([
 	// 	time: "14:49 · 发布于X",
 	// 	content: `如果这个疯狂的支出法案获得通过，‘美国党’将在第二天成立。`
 	// }
-
 ]);
 const handleGetMessage = async () => {
 	const params = {
@@ -854,7 +861,6 @@ const chart2Data = ref([
 	// 	name: "人工智能",
 	// 	value: 46
 	// },
-
 ]);
 // const colorList = ["#69B1FF", "#FFC069", "#87E8DE", "#85A5FF", "#FF7875", "#B37FEB", "#4096FF"];
 
@@ -892,7 +898,6 @@ const keyDecreeList = ref([
 	// 	time: "2025年2月",
 	// 	content: `将中国列为“外国对手”，系统性收紧中美在半导体、人工智能、量子技术等前沿科技领域的双向投资，构建对华科技封锁体系。`
 	// },
-
 ]);
 
 const handleGetKeyDecree = async () => {
@@ -1857,7 +1862,7 @@ onMounted(async () => {
 						height: 402px;
 						overflow-y: auto;
 						overflow-x: hidden;
-						padding-top: 6px;
+						padding: 6px 0;
 						.box3-item {
 							display: flex;
 							height: 77px;
@@ -1967,7 +1972,7 @@ onMounted(async () => {
 						height: 402px;
 						overflow-y: auto;
 						box-sizing: border-box;
-						padding-top: 8px;
+						padding-bottom: 8px;
 						.box4-main-item {
 							margin-top: 16px;
 							display: flex;
@@ -2601,7 +2606,8 @@ onMounted(async () => {
 						}
 					}
 					.box7-main {
-						height: 400px;
+						margin-top: 10px;
+						height: 380px;
 						box-sizing: border-box;
 						overflow-y: auto;
 						overflow-x: hidden;
@@ -2756,7 +2762,6 @@ onMounted(async () => {
 							background: rgba(20, 89, 187, 1);
 						}
 					}
-					
 				}
 				.select-box {
 					margin-top: 5px;
@@ -2919,7 +2924,7 @@ onMounted(async () => {
 										height: 24px;
 										border-radius: 12px;
 										overflow: hidden;
-										img{
+										img {
 											width: 100%;
 											height: 100%;
 										}

src/views/exportControl/index.vue

@@ -1901,10 +1901,14 @@ const handleMediaClick = item => {
 }
 
 .home-wrapper {
+	width: 100%;
+	height: calc(100vh - 96px);
+	position: relative;
+	overflow-y: hidden;
 	.home-main {
-		// width: 1400px;
-		padding: 0 5%;
-		margin: 0 auto;
+		width: 100%;
+		height: 100%;
+		overflow-y: auto;
 		background: url("./assets/images/background.png");
 		background-size: 100% 100%;
 		.home-main-header {

src/views/finance/index.vue

@@ -1698,10 +1698,14 @@ onMounted(async () => {
 }
 
 .home-wrapper {
+		width: 100%;
+	height: calc(100vh - 96px);
+	position: relative;
+	overflow-y: hidden;
 	.home-main {
-		// width: 1400px;
-		padding: 0 5%;
-		margin: 0 auto;
+		width: 100%;
+		height: 100%;
+		overflow-y: auto;
 		background: url("./assets/images/background.png");
 		background-size: 100% 100%;
 		.home-main-header {

src/views/innovationSubject/index.vue

@@ -352,7 +352,6 @@
 									/>
 								</el-select>
 							</div>							
-							
 						</div>				
 					</div>
 					<div class="center-footer-layout">
@@ -405,6 +404,7 @@
 					</div>
 				</div>
 				<div class="home-main-footer-main">
+
 					<div class="footer-main-item" v-for="item in universityList" :key="item.name" @click="handleClickToDetail">
 						<img :src="item.pic" style="height: 32px; width: 32px;" />
 						<div class="item-text">{{ item.name }}</div>
@@ -894,7 +894,6 @@ onMounted(async () => {
 
 	let chart1 = getPieChart(chart1Data.value, colorList);
 	setChart(chart1, "chart1");
-
 });
 </script>
 

src/views/marketAccessRestrictions/marketAccessHome/index.vue

@@ -1070,10 +1070,14 @@ onMounted(async () => {
 	box-shadow: none;
 }
 .home-wrapper {
+	width: 100%;
+	height: calc(100vh - 96px);
+	position: relative;
+	overflow-y: hidden;
 	.home-main {
-		// width: 1400px;
 		width: 100%;
-		margin: 0 auto;
+		height: 100%;
+		overflow-y: auto;
 		background: url("./assets/images/background.png");
 		background-size: 100% 100%;
 		.home-main-header {
@@ -1217,7 +1221,7 @@ onMounted(async () => {
 						right: 19px;
 						width: 6px;
 						height: 12px;
-						img{
+						img {
 							width: 100%;
 							height: 100%;
 						}

src/views/technologyFigures/index.vue

@@ -100,10 +100,13 @@
 						</div>
 						<div class="box2-main">
 							<div class="box2-main-item" v-for="(item, index) in warningList" :key="index">
-								<div class="item-left" :class="{
+								<div
+									class="item-left"
+									:class="{
 										itemLeftStatus1: item.status === '一般风险',
 										itemLeftStatus2: item.status === '重大风险'
-								}">
+									}"
+								>
 									{{ item.status }}
 								</div>
 								<div class="item-right">
@@ -131,14 +134,18 @@
 									<img src="./assets/images/TechnologyFigures-icon3.png" alt="" />
 								</div>
 								<!-- <div class="box3-header-title">{{ "人物动向" }}</div> -->
-								<div class="header-title"
-									style="width: 1560px; display: flex; justify-content: space-between; margin-top: 10px">
+								<div
+									class="header-title"
+									style="width: 1560px; display: flex; justify-content: space-between; margin-top: 10px"
+								>
 									<div class="box3-header-title">
 										{{ "人物动向" }}
 									</div>
 									<div style="display: flex; gap: 8px; margin-right: 12px">
-										<div v-for="value in peoDateList"
-											:class="peoDate !== value ? 'btn-box-samll' : 'btn-box-select-samll'">
+										<div
+											v-for="value in peoDateList"
+											:class="peoDate !== value ? 'btn-box-samll' : 'btn-box-select-samll'"
+										>
 											{{ value }}
 										</div>
 									</div>
@@ -154,14 +161,18 @@
 							<div class="header-icon">
 								<img src="./assets/images/header-message.png" alt="" />
 							</div>
-							<div class="header-title"
-								style="width: 1595px; display: flex; justify-content: space-between; margin-top: 10px">
+							<div
+								class="header-title"
+								style="width: 1595px; display: flex; justify-content: space-between; margin-top: 10px"
+							>
 								<div>
 									{{ "重要人物言论及立场" }}
 								</div>
 								<div style="display: flex; gap: 8px; margin-right: 12px">
-									<div v-for="value in fields"
-										:class="fieldSelect !== value ? 'btn-box-samll' : 'btn-box-select-samll'">
+									<div
+										v-for="value in fields"
+										:class="fieldSelect !== value ? 'btn-box-samll' : 'btn-box-select-samll'"
+									>
 										{{ value }}
 									</div>
 								</div>
@@ -178,18 +189,33 @@
 						<div class="box5-header">
 							<div class="box5-header-left">
 								<div class="box5-header-icon">
-									<img src="./assets/images/TechnologyFigures-icon1.png" alt=""
-										style="margin: 13px 21px 13px 21px; height: 22px" />
+									<img
+										src="./assets/images/TechnologyFigures-icon1.png"
+										alt=""
+										style="margin: 13px 21px 13px 21px; height: 22px"
+									/>
 									<div class="box5-header-title">{{ "科技人物观点词云" }}</div>
 								</div>
 								<div>
 									<div style="height: 45px; display: flex; align-items: center">
 										<el-select v-model="wordCloudvalue" style="width: 120px; height: 28px">
-											<el-option v-for="item in yearList" :key="item.value" :label="item.label" :value="item.value" />
+											<el-option
+												v-for="item in yearList"
+												:key="item.value"
+												:label="item.label"
+												:value="item.value"
+											/>
 										</el-select>
-										<el-select v-model="wordCloudfield" style="width: 120px; height: 28px; margin: 10px 24px 10px 5px">
-											<el-option v-for="item in fieldSelect" :key="item.value" :label="item.label"
-												:value="item.value" />
+										<el-select
+											v-model="wordCloudfield"
+											style="width: 120px; height: 28px; margin: 10px 24px 10px 5px"
+										>
+											<el-option
+												v-for="item in fieldSelect"
+												:key="item.value"
+												:label="item.label"
+												:value="item.value"
+											/>
 										</el-select>
 									</div>
 								</div>
@@ -202,17 +228,22 @@
 							<div class="header-icon">
 								<img src="./assets/images/box3-header-icon.png" alt="" />
 							</div>
-							<div class="header-title"
-								style="display: flex; width: 740px; justify-content: space-between; align-items: center">
+							<div
+								class="header-title"
+								style="display: flex; width: 740px; justify-content: space-between; align-items: center"
+							>
 								<div>
 									{{ "科技人物观点涉及领域变化趋势" }}
 								</div>
 
-
 								<el-select v-model="areaSelect" style="width: 120px; height: 28px">
-									<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+									<el-option
+										v-for="item in options"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									/>
 								</el-select>
-
 							</div>
 						</div>
 						<div class="box6-main" id="box6Chart"></div>
@@ -238,16 +269,22 @@
 								</div>
 								<div style="display: flex; width: 730px; justify-content: space-between; align-items: center">
 									<div class="box8-header-title">{{ "主要人物涉华观点统计" }}</div>
-									<div style="gap: 8px;display: flex;">
-										<div v-for="value in viewOption"
-											:class="viewSelect !== value ? 'btn-box-samll' : 'btn-box-select-samll'">
+									<div style="gap: 8px; display: flex">
+										<div
+											v-for="value in viewOption"
+											:class="viewSelect !== value ? 'btn-box-samll' : 'btn-box-select-samll'"
+										>
 											{{ value }}
 										</div>
-										<el-select v-model="wordCloudvalue" style="width: 120px; height: 28px;    margin-top: -5px;">
-											<el-option v-for="item in yearList" :key="item.value" :label="item.label" :value="item.value" />
+										<el-select v-model="wordCloudvalue" style="width: 120px; height: 28px; margin-top: -5px">
+											<el-option
+												v-for="item in yearList"
+												:key="item.value"
+												:label="item.label"
+												:value="item.value"
+											/>
 										</el-select>
 									</div>
-
 								</div>
 							</div>
 						</div>
@@ -262,8 +299,13 @@
 				<DivideHeader id="position4" class="divide-header" :titleText="'资源库'"></DivideHeader>
 				<div class="home-main-footer-header">
 					<div class="btn-box">
-						<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)"
+						>
 							{{ cate }}
 						</div>
 					</div>
@@ -438,13 +480,22 @@ onMounted(() => {
 }
 
 .home-wrapper {
+	width: 100%;
+	height: calc(100vh - 96px);
+	position: relative;
+	overflow-y: hidden;
 	.home-main {
-		width: 1920px;
-		margin: 0 auto;
+		// 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-repeat: no-repeat;
-		background-color: #fff;
-		background-size: contain;
+		background-size: 100% 100%;
 
 		.home-main-header {
 			display: flex;