fix:通用组件修改及市场准入模块修改

src/components/base/MainButton/MainButton.vue

 <template>
   <button class="main-button" :type="type">
-    
+    <div class="icon">
+      <slot name="button-icon"></slot>
+    </div>
+    <div class="button-text">{{ name }}</div>
   </button>
 </template>
 
@@ -19,26 +22,26 @@ defineProps({
 
 <style scoped>
 .main-button {
-  height: 28px;
-  padding: 0 8px;
+  height: 36px;
+  padding: 0 16px;
   border: 1px solid rgba(230, 231, 232, 1);
   border-radius: 4px;
   cursor: pointer;
-  line-height: 26px;
-  font-family: Source Han Sans CN;
-  font-size: 16px;
+  line-height: 34px;
+  font-family: var(--font-family-base);
+  font-size: var(--font-size-base);
   font-weight: 400;
   transition: all 0.3s;
 }
 
 .main-button[type="normal"] {
   background-color: rgba(255, 255, 255, 1);
-  color: rgba(59, 65, 75, 1);
+  color: var(--color-main-primary);
 }
 
 .main-button[type="active"] {
-  background-color: rgba(231, 243, 255, 1);
-  color: var(--color-main-active);
+  background-color: var(--color-main-active);
+  color: #fff;
   border: 1px solid var(--color-main-active);
 }
 

src/components/base/boxBackground/analysisBox.vue

@@ -4,10 +4,10 @@
       <div class="header-icon"></div>
       <div class="header-title">{{ title }}</div>
       <div class="header-btn" v-if="!showAllBtn">
-        <slot name="headerBtn"></slot>
+        <slot name="header-btn"></slot>
       </div>
       <div class="header-btn1" v-else>
-        <slot name="headerBtn"></slot>
+        <slot name="header-btn"></slot>
       </div>
       <div class="header-right">
         <div class="header-right-btn" @click="handleSave" v-if="showAllBtn">

src/components/base/boxBackground/overviewMainBox.vue

@@ -4,7 +4,7 @@
     <div class="overview-main-box-header">
       <div class="header-left">
         <div class="header-icon">
-          <slot name="headerIcon"></slot>
+          <slot name="header-icon"></slot>
         </div>
         <div class="header-title">{{ title }}</div>
       </div>

src/components/base/boxBackground/overviewNormalBox.vue

@@ -4,13 +4,13 @@
     <div class="overview-normal-box-header">
       <div class="header-left">
         <div class="header-icon">
-          <slot name="headerIcon"></slot>
+          <slot name="header-icon"></slot>
         </div>
         <div class="header-title">{{ title }}</div>
       </div>
 
       <div class="header-right">
-        <slot name="headerRight"></slot>
+        <slot name="header-right"></slot>
       </div>
     </div>
     <div class="wrapper-main">

src/styles/main.css

 :root {
   --color-main-active: rgba(5, 95, 194, 1);
   --color-main-primay: rgba(59, 65, 75, 1);
+  --font-family-base: "Source Han Sans CN";
+  --font-size-base: 16px;
+
+
   
   --color-bg-hover: #e7f3ff;
 

src/styles/var.scss

@@ -3,7 +3,8 @@
 $primary-color: var(--el-color-primary);
 $base-color: rgba(5, 95, 194, 1);
 $base-font-size: 16px;
-$base-font-family: "微软雅黑";
+// $base-font-family: "微软雅黑";
+$base-font-family: "Source Han Sans CN";
 
 // :root {
 // 	--base-color: #{$base-color};

src/views/bill/background/index.vue

@@ -44,7 +44,7 @@
 					</div>
 				</div> -->
 				<AnalysisBox title="立法背景" :showAllBtn="false">
-					<template #headerBtn>
+					<template #header-btn>
 						<div class="header-btn-box">
 							<div class="btn" @click="handleClickBox1Btn(1)">
 								<el-button type="primary" plain v-if="box1BtnActive === 1">涉华背景</el-button>
@@ -211,7 +211,7 @@
 				</div>
 			</div> -->
 			<AnalysisBox title="议员相关性分析" :showAllBtn="false">
-				<template #headerBtn>
+				<template #header-btn>
 					<div class="header-btn-box">
 						<div class="btn" @click="handleClickBox2Btn(1)">
 							<el-button type="primary" plain v-if="box2BtnActive === 1">赞成议员</el-button>

src/views/bill/deepDig/poliContribution/index.vue

@@ -60,7 +60,7 @@
 					</div>
 				</div> -->
 				<AnalysisBox title="主要议员" :showAllBtn="false">
-					<template #headerBtn>
+					<template #header-btn>
 						<div class="btn-box">
 							<div class="btn" :class="{ btnActive: activeBtnIndex === 0 }" @click="activeBtnIndex = 0">
 								{{ "参议院" }}

src/views/decree/decreeLayout/overview/background/index.vue

@@ -44,7 +44,7 @@
 					</div>
 				</div> -->
 				<AnalysisBox title="提出背景" :showAllBtn="false">
-					<template #headerBtn>
+					<template #header-btn>
 						<div class="header-btn-box">
 							<div class="btn" :class="{ btnActive: box1ActiveBtn === item }" v-for="(item, index) in box1BtnList"
 								:key="index" @click="handleClickBox1Btn(item)">

src/views/exportControl/v2.0CommercialControlList/components/sanctionsOverview/components/introductionPage/index.vue

@@ -42,7 +42,7 @@
 			</div>
 			<div class="left-bottom">
 				<AnalysisBox title="商业管制清单更新历史" :showAllBtn="false">
-					<template #headerBtn>
+					<template #header-btn>
 						<div class="filters">
 							<el-select v-model="selectedDomain" placeholder="Select"
 								style="width: 150px; height: 32px; margin-right: 16px">

src/views/exportControl/v2.0EntityList/components/dataStatistics/index.vue

@@ -94,7 +94,7 @@
 					</div>
 				</div> -->
 				<AnalysisBox title="制裁实体数量变化情况">
-					<template #headerBtn>
+					<template #header-btn>
 						<div class="toggle-btns">
 							<div class="t-btn" :class="{ active: activeTab === 'year' }" @click="handleTabChange('year')">
 								按年度
@@ -166,7 +166,7 @@
 					</div>
 				</div> -->
 				<AnalysisBox title="制裁实体地域分布情况">
-					<template #headerBtn>
+					<template #header-btn>
 						<el-select v-model="regionTime" class="time-select" placeholder="请选择" @change="getRegionCountData">
 							<el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
@@ -226,7 +226,7 @@
 					</div>
 				</div> -->
 				<AnalysisBox title="制裁实体领域分布情况">
-					<template #headerBtn>
+					<template #header-btn>
 						<el-select v-model="domainTime" class="time-select" placeholder="请选择" @change="getDomainCountData">
 							<el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
@@ -273,7 +273,7 @@
 					</div>
 				</div> -->
 				<AnalysisBox title="制裁实体类型分布情况">
-					<template #headerBtn>
+					<template #header-btn>
 						<el-select v-model="typeTime" class="time-select" placeholder="请选择" @change="getTypeCountData">
 							<el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>

src/views/exportControl/v2.0EntityList/components/deepMining/index.vue

@@ -40,7 +40,7 @@
 			</div>
 			<div class="right">
 				<AnalysisBox title="制裁产业链时序图">
-					<template #headerBtn>
+					<template #header-btn>
 						<el-select v-model="selectedIndustryId" placeholder="请选择" class="industry-select"
 							@change="() => { getFishboneData(); getCnEntityOnChainData(); }">
 							<el-option v-for="item in industryList" :key="item.id" :label="item.name" :value="item.id" />

src/views/exportControl/v2.0EntityList/components/sanctionsOverview/components/introductionPage/index.vue

@@ -73,7 +73,7 @@
 						layout="prev, pager, next" background @current-change="handlePageChangeAll" />
 				</div> -->
 				<AnalysisBox title="实体清单更新历史" :showAllBtn="false">
-					<template #headerBtn>
+					<template #header-btn>
 						<div class="filters">
 							<el-select v-model="selectedDomain" placeholder="Select"
 								style="width: 150px; height: 32px; margin-right: 16px">

src/views/exportControl/v2.0EntityList/components/sanctionsOverview/components/listPage/index.vue

@@ -103,7 +103,7 @@
 		prev-text="<" next-text=">" @current-change="handleCurrentChange" />
 </div> -->
 				<AnalysisBox title="实体清单" :showAllBtn="false">
-					<template #headerBtn>
+					<template #header-btn>
 						<div class="stats">
 							<div class="dot"></div>
 							<div class="count-text">共 <span class="highlight">{{ ruleCount.totalCount }}</span> 家</div>

src/views/exportControl/v2.0SingleSanction/components/impactAnalysis/components/industrialImpact/index.vue

@@ -112,7 +112,7 @@
 						</div>
 					</div> -->
 					<AnalysisBox title="企业规模">
-						<template #headerBtn>
+						<template #header-btn>
 							<div class="toggle-btns">
 								<div class="t-btn" :class="{ active: activeScale === item }" v-for="item in scaleOptions" :key="item"
 									@click="handleScaleClick(item)">
@@ -188,7 +188,7 @@
 						</div>
 					</div> -->
 					<AnalysisBox title="企业研发投入">
-						<template #headerBtn>
+						<template #header-btn>
 							<div class="toggle-btns">
 								<div class="t-btn" :class="{ active: activeRD === item }" v-for="item in rdOptions" :key="item"
 									@click="activeRD = item">
@@ -233,7 +233,7 @@
 						</div>
 					</div> -->
 										<AnalysisBox title="企业市场占比">
-						<template #headerBtn>
+						<template #header-btn>
 					<div class="toggle-btns">
 								<div class="t-btn" :class="{ active: activeMarketShare === item }" v-for="item in marketShareOptions"
 									:key="item" @click="activeMarketShare = item">

src/views/exportControl/v2.0SingleSanction/components/impactAnalysis/components/researchImpact/index.vue

@@ -3,7 +3,7 @@
 		<div class="main">
 			<div class="left">
 				<AnalysisBox title="制裁科研机构列表" :showAllBtn="false">
-					<template #headerBtn>
+					<template #header-btn>
 						<el-select v-model="searchDomain" class="dependency-select" placeholder="全部领域">
 							<el-option v-for="item in domainOptions" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
@@ -82,7 +82,7 @@
 						</div>
 					</div> -->
 					<AnalysisBox title="新增国际合作项目">
-						<template #headerBtn>
+						<template #header-btn>
 							<el-select v-model="activeProjectDomain" class="project-domain-select" placeholder="全部领域">
 								<el-option v-for="item in projectDomainOptions" :key="item.value" :label="item.label"
 									:value="item.value" />
@@ -127,7 +127,7 @@
 						</div>
 					</div> -->
 					<AnalysisBox title="新增国际合著论文">
-						<template #headerBtn>
+						<template #header-btn>
 							<el-select v-model="activePaperDomain" class="paper-domain-select" placeholder="全部领域">
 								<el-option v-for="item in paperDomainOptions" :key="item.value" :label="item.label"
 									:value="item.value" />

src/views/marketAccessRestrictions/marketAccessHome/index.vue

@@ -3,14 +3,6 @@
 		<div class="home-main" ref="containerRef">
 			<div class="home-top-bg"></div>
 			<div class="home-main-header">
-				<!-- <div class="home-main-header-top">
-					<div class="header-left">
-						<HeaderMenu></HeaderMenu>
-					</div>
-					<div class="header-right">
-						<headerInfo curTitleName="市场准入限制"></headerInfo>
-					</div>
-				</div> -->
 				<div class="home-main-header-center">
 					<SearchContainer style="margin-bottom: 0;margin-top: 48px;  height: fit-content" v-if="containerRef"
 						placeholder="搜索市场准入限制调查" :containerRef="containerRef" areaName="" />
@@ -188,7 +180,7 @@
 							</el-carousel-item>
 						</el-carousel> -->
 						<overviewMainBox title="调查进展" @toDetail="handleClickToDetail()">
-							<template #headerIcon>
+							<template #header-icon>
 								<img style="width: 100%; height: 100%" src="./assets/images/box1-header-icon.png" alt="" />
 							</template>
 							<div class="box1-left" @click="handleSwithCurSurvey('left')">
@@ -275,10 +267,10 @@
 				<div class="center-footer">
 					<div class="box5">
 						<OverviewNormalBox title="调查数量">
-							<template #headerIcon>
+							<template #header-icon>
 								<img style="width: 100%; height: 100%;" src="./assets/images/box3-header-icon.png" alt="" />
 							</template>
-							<template #headerRight>
+							<template #header-right>
 								<div class="box-header-right">
 									<div class="icon">
 										<img src="@/assets/images/icon/header-btn.png" alt="" />
@@ -299,10 +291,10 @@
 					</div>
 					<div class="box6">
 						<OverviewNormalBox title="制裁领域分布" width="521px">
-							<template #headerIcon>
+							<template #header-icon>
 								<img style="width: 100%; height: 100%;" src="./assets/images/box6-header-icon.png" alt="" />
 							</template>
-							<template #headerRight>
+							<template #header-right>
 								<div class="box-header-right">
 									<div class="icon">
 										<img src="@/assets/images/icon/header-btn.png" alt="" />
@@ -377,7 +369,8 @@
 			<div class="home-main-footer">
 				<DivideHeader id="position4" class="divide-header" :titleText="'资源库'"></DivideHeader>
 				<div class="home-main-footer-header">
-					<SourceTabList :sourceTabList="categoryList" :activeSouceTabId="activeCateId" @clickTab="handleClickCate"></SourceTabList>
+					<SourceTabList :sourceTabList="categoryList" :activeSouceTabId="activeCateId" @clickTab="handleClickCate">
+					</SourceTabList>
 					<div class="select-box">
 						<div class="paixu-btn" @click="handleSwithSort">
 							<div class="icon1">
@@ -493,9 +486,13 @@
 										{{ item.CONTENT }}
 									</div>
 									<div class="item-right-footer">
-										<div class="area-box" v-for="(val, idx) in item.searchArea" :key="idx">
+										<!-- <div class="area-box" v-for="(val, idx) in item.searchArea" :key="idx">
 											<div class="area">{{ val }}</div>
+										</div> -->
+										<div class="area-box" v-if="item.searchArea.length">
+											<AreaTag v-for="(val, idx) in item.searchArea" :key="idx" :tagName="val"></AreaTag>
 										</div>
+
 										<div class="flag-box">
 											<div class="flag" v-for="(vall, idxx) in item.countryImage" :key="idxx">
 												<img :src="vall" alt="" />
@@ -1474,7 +1471,7 @@ const handleGetSurveyList = async () => {
 		console.log("调查列表", res);
 		if (res.code === 200 && res.data) {
 			totalDiscussNum.value = res.data.totalElements;
-			surveyInfoList.value = res.data.content;
+			surveyInfoList.value = res.data.content
 		} else {
 			surveyInfoList.value = [];
 		}
@@ -2714,9 +2711,11 @@ onMounted(async () => {
 						justify-content: flex-end;
 						align-items: center;
 						gap: 8px;
+
 						.icon {
 							width: 14px;
 							height: 16px;
+
 							img {
 								width: 100%;
 								height: 100%;
@@ -3006,17 +3005,15 @@ onMounted(async () => {
 		}
 
 		.home-main-footer {
-			// width: 100%;
-			// height: 1149px;
-			padding-bottom: 20px;
+			margin-top: 36px;
 			background: rgba(248, 249, 250, 1);
 			overflow: hidden;
+			padding-bottom: 100px;
 
 			.home-main-footer-header {
 				width: 1600px;
 				height: 42px;
-				margin: 36px auto;
-				// background: orange;
+				margin: 0 auto;
 				display: flex;
 				justify-content: space-between;
 
@@ -3116,16 +3113,13 @@ onMounted(async () => {
 
 			.home-main-footer-main {
 				width: 1600px;
-				margin-bottom: 20px;
-				// height: 985px;
 				margin: 0 auto;
-				box-sizing: border-box;
-				// padding: 20px;
+				margin-top: 34px;
 				display: flex;
 
 				.left {
 					width: 360px;
-					// height: 700px;
+					height: max-content;
 					padding-bottom: 20px;
 					border-radius: 10px;
 					box-shadow: 0px 0px 15px 0px rgba(60, 87, 126, 0.2);
@@ -3394,12 +3388,14 @@ onMounted(async () => {
 								}
 
 								.item-right-footer {
+									width: 1022px;
 									margin-top: 9px;
 									display: flex;
 									gap: 8px;
 
 									.area-box {
 										display: flex;
+										gap: 8px;
 
 										.area {
 											height: 24px;
@@ -3473,9 +3469,7 @@ onMounted(async () => {
 }
 
 .divide-header {
-	margin: 0 auto;
-	margin-top: 52px;
-	margin-bottom: 36px;
+	margin: 52px auto 30px;
 }
 
 :deep(.el-input__wrapper) {

src/views/thinkTank/ThinkTankDetail/ReportTab.vue

@@ -67,7 +67,7 @@
   </el-row>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import { onMounted, ref } from 'vue';
 import { Search } from '@element-plus/icons-vue';
 import { getThinkTankReport } from '@/api';