合并分支 'dev_hhq' 到 'master'

src/api/thinkTank/overview.js

@@ -10,6 +10,15 @@ export function getThinkTankList() {
   })
 }
 
+//智库概览:获取智库发布
+export function getNewReport() {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankOverview/newReport`,
+
+  })
+}
+
 // 风险信号
 export function getThinkTankRiskSignal() {
   return request({
@@ -20,10 +29,10 @@ export function getThinkTankRiskSignal() {
 }
 
 // 政策建议趋势分布
-export function getThinkTankPolicyIndustryChange() {
+export function getThinkTankPolicyIndustryChange(params) {
   return request({
     method: 'GET',
-    url: `/api/thinkTankOverview/policyIndustryChange`,
+    url: `/api/thinkTankOverview/policyIndustryChange/${params}`,
 
   })
 }
@@ -44,4 +53,188 @@ export function getThinkTankDonation() {
     url: `/api/thinkTankOverview/donation`,
 
   })
-}
+}
\ No newline at end of file
+
+//智库概览:获取智库研究热点
+export function getThinkTankHot(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankOverview/research/hot/${params}`,
+
+  })
+}
+
+
+// 行业领域字典列表
+export function getHylyList() {
+  return request({
+    method: 'GET',
+    url: `/api/billImpactAnalysis/industry/hylyList`,
+  })
+}
+
+
+//获取智库报告
+export function getThinkTankReport(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankOverview/report`,
+    params: params
+  })
+}
+
+/*********  智库信息 */
+//智库百科:获取全局信息
+export function getThinkTankSummary(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/summary/${params.id}`,
+
+  })
+}
+
+
+//智库报告:获取智库报告类型
+export function getThinkDynamicsReportType() {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/reportType`,
+  })
+}
+
+//智库动态:获取智库报告
+export function getThinkDynamicsReport(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/report/${params.id}/${params.startDate}`,
+    params: params.parmas
+  })
+}
+
+
+//提出建议领域分布
+export function getThinkPolicyIndustry(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/policyIndustry/${params.id}/${params.year}`,
+  })
+}
+
+//获取相关政策领域分布
+export function getThinkPolicyIndustryTotal(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/policyIndustryTotal/${params.id}/${params.year}`,
+  })
+}
+
+//获取热门研究方向变化趋势
+export function getThinkPolicyIndustryChange(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/policyIndustryChange/${params.id}/${params.year}`,
+  })
+}
+
+//获取智库政策
+export function getThinkPolicy(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/policy/${params.id}/${params.startDate}`,
+  })
+}
+
+//智库百科基本信息
+export function getThinkTankInfoBasic(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/basic/${params}`,
+  })
+}
+
+//获取全球分支机构
+export function getThinkTankInfoBranch(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/branch/${params}`,
+  })
+}
+
+//获取经费来源统计
+export function getThinkTankFundsTotal(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/fundsTotal/${params}`,
+  })
+}
+//获取经费来源
+export function getThinkTankFundsSource(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/fundsSource/${params}`,
+  })
+}
+
+//获取研究领域演变
+export function getThinkTankResearchAreae(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/researchArea/${params}`,
+  })
+}
+
+//获取核心研究人员
+export function getThinkTankPerson(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankInfo/person/${params}`,
+  })
+}
+
+//获取报告内容摘要
+export function getThinkTankReportAbstract(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankReport/abstract/${params}`,
+  })
+}
+
+//获取报告主要观点
+export function getThinkTankReportContent(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankReport/content/${params}`,
+  })
+}
+
+//获取涉及科技领域
+export function getThinkTankReportIndustry(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankReport/industry/${'Rand_RRA3572-1'}`,
+  })
+}
+
+//获取科技领域词云
+export function getThinkTankReportIndustryCloud(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankReport/industry/${params.id}/${params.industryId}`,
+  })
+}
+
+//获取政策建议落实情况
+export function getThinkTankReportPolicy(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankReport/policy/${params}`,
+  })
+}
+
+//获取相关政策动态
+export function getThinkTankReportPolicyAction(params) {
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankReport/policyAction/${params}`,
+  })
+}

src/views/overView/component/Timeline.vue

@@ -177,7 +177,7 @@ export default {
 /* 向上节点：线往下伸 */
 .dot.up::after {
   bottom: 100%;
-  height: 180px;
+  height: 165px;
   /* 圆环底部 → 卡片顶 */
 }
 
@@ -185,15 +185,15 @@ export default {
 .dot.down::after {
 
   top: 100%;
-  height: 180px;
+  height: 165px;
 }
 
 
 
 .card {
   position: absolute;
-  height: 180px;
-  width:320px;
+  height: 165px;
+  width: 320px;
   padding: 8px 12px;
   text-align: left;
   cursor: pointer;
@@ -208,6 +208,7 @@ export default {
   line-height: 26px;
   letter-spacing: 0px;
   text-align: justify;
+  margin-bottom: 10px;
 }
 
 .title {
@@ -218,6 +219,7 @@ export default {
   line-height: 26px;
   letter-spacing: 0px;
   text-align: justify;
+  margin-bottom: 10px;
 }
 
 .content {

src/views/overView/index.vue

@@ -52,27 +52,20 @@
 											}}
 										</div>
 									</div>
-									<img
-										class="item-card-content-title-image"
-										:src="organizationNews[organizationNewsShow].image"
-										alt=""
-									/>
+									<img class="item-card-content-title-image" :src="organizationNews[organizationNewsShow].image"
+										alt="" />
 								</div>
 								<div class="item-header-divider"></div>
 								<div class="item-card-content-text">
 									{{ organizationNews[organizationNewsShow].content }}
 								</div>
 								<div style="display: flex; margin-top: 30px">
-									<div
-										class="item-card-content-tag"
-										v-for="(tag, index) in organizationNews[organizationNewsShow].tag"
-										:key="index"
-										:style="{
+									<div class="item-card-content-tag" v-for="(tag, index) in organizationNews[organizationNewsShow].tag"
+										:key="index" :style="{
 											color: tag.textColor,
 											background: tag.color,
 											border: `1px solid ${tag.textColor}`
-										}"
-									>
+										}">
 										{{ tag.text }}
 									</div>
 								</div>
@@ -114,13 +107,10 @@
 					<div style="padding: 30px 23px; height: 400px">
 						<div class="waring-item" v-for="(item, index) in warningList" :key="index">
 							<div style="display: flex; height: 47px">
-								<div
-									class="waring-status"
-									:style="{
-										color: item.status === 0 ? '#CE4F51' : item.status === 1 ? '#FA8C16' : '#52C41A',
-										backgroundColor: item.status === 0 ? '#FFF1F0' : item.status === 1 ? '#FFF7E6' : '#F6FFED'
-									}"
-								>
+								<div class="waring-status" :style="{
+									color: item.status === 0 ? '#CE4F51' : item.status === 1 ? '#FA8C16' : '#52C41A',
+									backgroundColor: item.status === 0 ? '#FFF1F0' : item.status === 1 ? '#FFF7E6' : '#F6FFED'
+								}">
 									{{ item.status === 0 ? "特别重大" : item.status === 1 ? "重大风险" : "一般风险" }}
 								</div>
 								<div class="waring-text">
@@ -424,7 +414,7 @@ function changeOrganizationNews(type) {
 			: (organizationNewsShow.value = organizationNewsShow.value + 1);
 	}
 }
-onMounted(() => {});
+onMounted(() => { });
 </script>
 
 <style lang="scss" scoped>
@@ -450,6 +440,7 @@ onMounted(() => {});
 		box-sizing: border-box;
 		padding-left: 160px;
 		position: relative;
+
 		.header-search-box {
 			position: absolute;
 			top: 14px;
@@ -457,6 +448,7 @@ onMounted(() => {});
 			display: flex;
 			gap: 12px;
 			justify-content: flex-end;
+
 			.header-search-left {
 				width: 360px;
 				height: 36px;
@@ -464,18 +456,22 @@ onMounted(() => {});
 				border-radius: 4px;
 				background: rgba(255, 255, 255, 0.3);
 				display: flex;
+
 				.input-box {
 					width: 324px;
 				}
+
 				.icon {
 					width: 36px;
 					height: 36px;
+
 					img {
 						width: 100%;
 						height: 100%;
 					}
 				}
 			}
+
 			.header-search-right {
 				width: 36px;
 				height: 36px;
@@ -483,10 +479,12 @@ onMounted(() => {});
 				border-radius: 4px;
 				background: rgba(255, 255, 255, 0.3);
 				cursor: pointer;
+
 				.header-img-box {
 					width: 19px;
 					height: 24px;
 					margin: 4px auto;
+
 					img {
 						width: 100%;
 						height: 100%;
@@ -590,6 +588,7 @@ onMounted(() => {});
 						font-size: 14px;
 					}
 				}
+
 				.item-header-text-1 {
 					// width: 150px;
 					height: 48px;
@@ -641,7 +640,7 @@ onMounted(() => {});
 			}
 
 			.item-card-content-tag {
-				width: 74px;
+				width: 76px;
 				height: 24px;
 				padding: 1px 8px 1px 8px;
 				margin: 2px;
@@ -682,7 +681,7 @@ onMounted(() => {});
 
 					.item-card-content {
 						height: 100%;
-						width: calc(100% - 50px);
+						width: 454px;
 						padding: 20px;
 
 						.item-card-content-header {
@@ -1002,10 +1001,12 @@ onMounted(() => {});
 		}
 	}
 }
+
 :deep(.el-input__wrapper) {
 	box-shadow: none;
 	background: none;
 }
+
 :deep(.el-input__wrapper:hover) {
 	box-shadow: none !important;
 }
@@ -1013,6 +1014,7 @@ onMounted(() => {});
 :deep(.el-input__wrapper.is-focus) {
 	box-shadow: none !important;
 }
+
 :deep(.el-input__inner::placeholder) {
 	color: rgba(132, 136, 142, 1);
 	font-family: Microsoft YaHei;

src/views/thinkTank/ReportDetail/index.vue

@@ -63,10 +63,10 @@
 				</div>
 			</div>
 		</div>
-    <div class="main">
-      <ReportAnalysis v-if="tabActiveName === '报告分析'"></ReportAnalysis>
+		<div class="main">
+			<ReportAnalysis v-if="tabActiveName === '报告分析'"></ReportAnalysis>
 			<PolicyTracking v-else></PolicyTracking>
-    </div>
+		</div>
 	</div>
 </template>
 
@@ -86,7 +86,8 @@ const switchTab = name => {
 <style lang="scss" scoped>
 .wrap {
 	width: 1920px;
-	height: 984px;
+	// height: 984px;
+
 	.header {
 		width: 1920px;
 		height: 188px;
@@ -95,12 +96,14 @@ const switchTab = name => {
 		border-top: 1px solid rgba(234, 236, 238, 1);
 		box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 		background: rgba(255, 255, 255, 1);
+
 		.header-top {
 			margin-top: 20px;
 			margin-left: 248px;
 			display: flex;
 			justify-content: space-between;
 			margin-right: 160px;
+
 			.header-top-left {
 				.title {
 					height: 26px;
@@ -112,6 +115,7 @@ const switchTab = name => {
 					letter-spacing: 0px;
 					text-align: left;
 				}
+
 				.en-title {
 					height: 24px;
 					color: rgba(95, 101, 108, 1);
@@ -122,10 +126,12 @@ const switchTab = name => {
 					letter-spacing: 0px;
 					text-align: left;
 				}
+
 				.tag-box {
 					margin-top: 11px;
 					display: flex;
 					gap: 8px;
+
 					.tag {
 						height: 26px;
 						padding: 0 8px;
@@ -143,6 +149,7 @@ const switchTab = name => {
 					}
 				}
 			}
+
 			.header-top-right {
 				.name {
 					height: 24px;
@@ -154,6 +161,7 @@ const switchTab = name => {
 					letter-spacing: 0px;
 					text-align: right;
 				}
+
 				.time {
 					height: 24px;
 					margin-top: 5px;
@@ -167,6 +175,7 @@ const switchTab = name => {
 				}
 			}
 		}
+
 		.header-bottom {
 			margin: 0 auto;
 			margin-top: 30px;
@@ -174,13 +183,15 @@ const switchTab = name => {
 			height: 48px;
 			display: flex;
 			justify-content: space-between;
+
 			.tab-box {
 				width: 224px;
 				height: 48px;
 				display: flex;
 				gap: 24px;
+
 				.tab {
-					width: 92px;
+					width: 94px;
 					height: 48px;
 					display: flex;
 					align-items: center;
@@ -188,14 +199,17 @@ const switchTab = name => {
 					gap: 4px;
 					cursor: pointer;
 					border-bottom: 2px solid transparent;
+
 					.icon {
 						width: 16px;
 						height: 16px;
+
 						img {
 							width: 100%;
 							height: 100%;
 						}
 					}
+
 					.text {
 						height: 24px;
 						color: rgba(59, 65, 75, 1);
@@ -204,18 +218,22 @@ const switchTab = name => {
 						font-weight: 400;
 						line-height: 24px;
 					}
+
 					.textActive {
 						color: rgba(5, 95, 194, 1);
 						font-weight: 700;
 					}
 				}
+
 				.tabActive {
 					border-bottom: 2px solid rgba(5, 95, 194, 1);
 				}
 			}
+
 			.btn-box {
 				display: flex;
 				gap: 12px;
+
 				.btn {
 					width: 120px;
 					height: 36px;
@@ -227,16 +245,19 @@ const switchTab = name => {
 					align-items: center;
 					justify-content: center;
 					gap: 8px;
+
 					.icon {
 						width: 16px;
 						height: 16px;
+
 						img {
 							width: 100%;
 							height: 100%;
 						}
 					}
+
 					.text {
-						width: 64px;
+						width: 66px;
 						height: 22px;
 						color: rgba(95, 101, 108, 1);
 						font-family: Microsoft YaHei;
@@ -247,18 +268,21 @@ const switchTab = name => {
 						text-align: center;
 					}
 				}
+
 				.btn1 {
 					border-radius: 6px;
 					background: var(--color-main-active);
-          .text{
-            color: rgba(255,255,255,1);
-          }
+
+					.text {
+						color: rgba(255, 255, 255, 1);
+					}
 				}
 			}
 		}
 	}
-  .main{
-    width: 100%;
-  }
+
+	.main {
+		width: 100%;
+	}
 }
 </style>
\ No newline at end of file

src/views/thinkTank/ReportDetail/policyTracking/index.vue

@@ -17,10 +17,10 @@
 				<div class="box1-main">
 					<div class="box1-item" v-for="(item, index) in box1Data" :key="index">
 						<div class="left">
-							{{ item.id }}
+							{{ index + 1 }}
 						</div>
 						<div class="center">
-							<div class="title">{{ item.title }}</div>
+							<div class="title">{{ item.content }}</div>
 							<div class="tag-box">
 								<div class="tag" v-for="(val, idx) in item.tagList" :key="idx">
 									{{ val }}
@@ -28,8 +28,15 @@
 							</div>
 							<div class="file-box">
 								<div class="file-item" v-for="(vall, idxx) in item.fileList" :key="idxx">
-									<div class="file-item-left">{{ vall.type }}</div>
-									<div class="file-item-center">{{ vall.name }}</div>
+									<div class="file-item-left">法案</div>
+									<div class="file-item-center">{{ vall.relationBillsList }}</div>
+									<div class="file-item-right">
+										<img src="@/assets/images/icon-right-circle.png" alt="" />
+									</div>
+								</div>
+								<div class="file-item" v-for="(vall, idxx) in item.fileList" :key="idxx">
+									<div class="file-item-left">政令</div>
+									<div class="file-item-center">{{ vall.relationAdList }}</div>
 									<div class="file-item-right">
 										<img src="@/assets/images/icon-right-circle.png" alt="" />
 									</div>
@@ -46,14 +53,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="box1-footer">
-					<div class="info">
-						{{ `共105项调查` }}
-					</div>
-					<div class="page-box">
-						<el-pagination :page-size="10" background layout="prev, pager, next" :total="120" />
-					</div>
-				</div>
+
 			</div>
 		</div>
 
@@ -79,13 +79,13 @@
 						<div class="line" v-if="index < 5"></div>
 					</div>
 					<div class="box2-item-center">
-						<div class="title">{{ item.title }}</div>
-						<div class="content">{{ item.content }}</div>
+						<div class="title">{{ item.sjbt }}</div>
+						<div class="content">{{ item.sjnr }}</div>
 					</div>
 					<div class="box2-item-right">
 						<div class="time">{{ item.time }}</div>
 						<div class="img-box">
-							<img :src="item.img" alt="" />
+							<img :src="item.imageUrl" alt="" />
 						</div>
 					</div>
 				</div>
@@ -102,7 +102,12 @@
 
 <script setup>
 import { ref, onMounted } from "vue";
-
+import {
+	getThinkTankReportPolicy,
+	getThinkTankReportPolicyAction
+} from "@/api/thinkTank/overview";
+import { useRouter } from "vue-router";
+const router = useRouter();
 // 政策建议落实情况
 const box1Data = ref([
 	{
@@ -257,6 +262,19 @@ const box1Data = ref([
 	}
 ]);
 
+const handleGetThinkTankReportPolicy = async () => {
+	try {
+		const res = await getThinkTankReportPolicy(router.currentRoute._value.params.id);
+		console.log("政策建议落实情况", res);
+		if (res.code === 200 && res.data) {
+			box1Data.value = res.data
+		}
+	} catch (error) {
+		console.error("获取政策建议落实情况rror", error);
+	}
+};
+
+
 // 相关政策动态
 const box2Data = ref([
 	{
@@ -296,6 +314,24 @@ const box2Data = ref([
 		img: 1
 	}
 ]);
+
+const handleGetThinkTankReportPolicyAction = async () => {
+	try {
+		const res = await getThinkTankReportPolicyAction(router.currentRoute._value.params.id);
+		console.log("相关政策动态", res);
+		if (res.code === 200 && res.data) {
+			box2Data.value = res.data
+		}
+	} catch (error) {
+		console.error("获取相关政策动态rror", error);
+	}
+};
+
+
+onMounted(async () => {
+	handleGetThinkTankReportPolicy()
+	handleGetThinkTankReportPolicyAction()
+});
 </script>
 
 <style lang="scss" scoped>
@@ -303,11 +339,14 @@ const box2Data = ref([
 	display: flex;
 	justify-content: center;
 	gap: 16px;
+	height: 100%;
+
 	.box-header {
 		width: 100%;
 		height: 50px;
 		display: flex;
 		position: relative;
+
 		.header-left {
 			margin-top: 18px;
 			width: 8px;
@@ -315,6 +354,7 @@ const box2Data = ref([
 			border-radius: 0 4px 4px 0;
 			background: var(--color-main-active);
 		}
+
 		.title {
 			margin-left: 14px;
 			margin-top: 14px;
@@ -325,6 +365,7 @@ const box2Data = ref([
 			font-size: 20px;
 			font-weight: 700;
 		}
+
 		.header-btn-box {
 			position: absolute;
 			top: 15px;
@@ -332,6 +373,7 @@ const box2Data = ref([
 			display: flex;
 			justify-content: flex-end;
 			gap: 8px;
+
 			.btn {
 				height: 28px;
 				padding: 0 8px;
@@ -345,11 +387,13 @@ const box2Data = ref([
 				font-weight: 400;
 				line-height: 28px;
 			}
+
 			.btnActive {
 				color: var(--color-main-active);
 				border: 1px solid var(--color-main-active);
 			}
 		}
+
 		.header-right {
 			position: absolute;
 			top: 14px;
@@ -357,9 +401,11 @@ const box2Data = ref([
 			display: flex;
 			justify-content: flex-end;
 			gap: 4px;
+
 			.icon {
 				width: 28px;
 				height: 28px;
+
 				img {
 					width: 100%;
 					height: 100%;
@@ -367,26 +413,32 @@ const box2Data = ref([
 			}
 		}
 	}
+
 	.left {
-		height: 1442px;
+		height: 100%;
+
 		.box1 {
 			margin-top: 16px;
 			width: 1104px;
-			height: 1405px;
+			height: 100%;
 			margin-bottom: 16px;
 			border: 1px solid rgba(234, 236, 238, 1);
 			border-radius: 10px;
 			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 			background: rgba(255, 255, 255, 1);
+
 			.box1-main {
 				width: 1056px;
 				height: 1280px;
 				margin: 0 auto;
+				overflow: auto;
+
 				.box1-item {
 					height: 128px;
 					border-bottom: 1px solid rgba(234, 236, 238, 1);
 					display: flex;
 					position: relative;
+
 					.left {
 						width: 28px;
 						height: 28px;
@@ -402,8 +454,10 @@ const box2Data = ref([
 						font-weight: 400;
 						letter-spacing: 0px;
 					}
+
 					.center {
 						margin-left: 18px;
+
 						.title {
 							margin-top: 16px;
 							height: 24px;
@@ -415,10 +469,12 @@ const box2Data = ref([
 							letter-spacing: 0px;
 							text-align: left;
 						}
+
 						.tag-box {
 							display: flex;
 							margin-top: 7px;
 							gap: 8px;
+
 							.tag {
 								height: 22px;
 								padding: 0 8px;
@@ -435,10 +491,12 @@ const box2Data = ref([
 								text-align: left;
 							}
 						}
+
 						.file-box {
 							margin-top: 7px;
 							display: flex;
 							gap: 8px;
+
 							.file-item {
 								height: 32px;
 								padding: 0 8px;
@@ -446,6 +504,7 @@ const box2Data = ref([
 								background: rgba(246, 250, 255, 1);
 								display: flex;
 								align-items: center;
+
 								.file-item-left {
 									height: 22px;
 									padding: 0 4px;
@@ -460,6 +519,7 @@ const box2Data = ref([
 									letter-spacing: 0px;
 									text-align: left;
 								}
+
 								.file-item-center {
 									margin-left: 12px;
 									color: var(--color-main-active);
@@ -470,10 +530,12 @@ const box2Data = ref([
 									letter-spacing: 0px;
 									text-align: left;
 								}
+
 								.file-item-right {
 									margin-left: 12px;
 									width: 20px;
 									height: 20px;
+
 									img {
 										width: 100%;
 										height: 100%;
@@ -482,6 +544,7 @@ const box2Data = ref([
 							}
 						}
 					}
+
 					.right {
 						position: absolute;
 						top: 16px;
@@ -491,6 +554,7 @@ const box2Data = ref([
 						justify-content: flex-end;
 						align-items: center;
 						gap: 9px;
+
 						.text {
 							height: 24px;
 							font-family: Microsoft YaHei;
@@ -501,9 +565,11 @@ const box2Data = ref([
 							letter-spacing: 0px;
 							text-align: right;
 						}
+
 						.icon {
 							width: 16px;
 							height: 16px;
+
 							img {
 								width: 100%;
 								height: 100%;
@@ -512,12 +578,14 @@ const box2Data = ref([
 					}
 				}
 			}
+
 			.box1-footer {
 				height: 50px;
 				display: flex;
 				justify-content: space-between;
 				box-sizing: border-box;
 				padding: 20px;
+
 				.info {
 					color: rgba(132, 136, 142, 1);
 					font-family: Microsoft YaHei;
@@ -539,24 +607,30 @@ const box2Data = ref([
 		border-radius: 10px;
 		box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 		background: rgba(255, 255, 255, 1);
+
 		.box2-main {
 			margin: 0 auto;
 			margin-top: 15px;
 			width: 459px;
 			height: 654px;
+			overflow: hidden;
+
 			.box2-item {
 				height: 109px;
 				display: flex;
+
 				.box2-item-left {
 					.point {
 						margin-left: 14px;
 						width: 10px;
 						height: 10px;
+
 						img {
 							width: 100%;
 							height: 100%;
 						}
 					}
+
 					.line {
 						width: 2px;
 						height: 109px;
@@ -564,8 +638,10 @@ const box2Data = ref([
 						margin-left: 18px;
 					}
 				}
+
 				.box2-item-center {
 					margin-left: 11px;
+
 					.title {
 						width: 314px;
 						height: 24px;
@@ -580,6 +656,7 @@ const box2Data = ref([
 						text-overflow: ellipsis;
 						white-space: nowrap;
 					}
+
 					.content {
 						width: 314px;
 						height: 48px;
@@ -593,8 +670,10 @@ const box2Data = ref([
 						overflow: hidden;
 					}
 				}
+
 				.box2-item-right {
 					margin-left: 18px;
+
 					.time {
 						height: 22px;
 						color: rgba(95, 101, 108, 1);
@@ -608,11 +687,13 @@ const box2Data = ref([
 						text-overflow: ellipsis;
 						white-space: nowrap;
 					}
+
 					.img-box {
 						margin-top: 14px;
 						width: 78px;
 						height: 50px;
 						border-radius: 2px;
+
 						img {
 							width: 100%;
 							height: 100%;
@@ -621,6 +702,7 @@ const box2Data = ref([
 				}
 			}
 		}
+
 		.box2-footer {
 			margin: 10px auto;
 			width: 108px;
@@ -630,9 +712,11 @@ const box2Data = ref([
 			justify-content: center;
 			gap: 4px;
 			cursor: pointer;
+
 			&:hover {
 				background: var(--color-bg-hover);
 			}
+
 			.text {
 				color: var(--color-main-active);
 				height: 22px;
@@ -642,9 +726,11 @@ const box2Data = ref([
 				line-height: 22px;
 				letter-spacing: 0px;
 			}
+
 			.icon {
 				width: 16px;
 				height: 16px;
+
 				img {
 					width: 100%;
 					height: 100%;

src/views/thinkTank/ThinkTankDetail/index.vue

@@ -3,19 +3,19 @@
 		<div class="header">
 			<div class="header-top">
 				<div class="header-top-left">
-					<img src="" alt="" />
+					<img :src="thinkTank.imageUrl" alt="" />
 				</div>
 				<div class="header-top-center">
 					<div class="center-top">
-						<div class="name">{{ "兰德公司" }}</div>
-						<div class="e-name">{{ "RAND Corporation" }}</div>
+						<div class="name">{{ thinkTank.name }}</div>
+						<div class="e-name">{{ thinkTank.ename }}</div>
 					</div>
 					<div class="center-center">
-						{{ "全球顶尖政策研究机构，专注于国家安全、科技政策、医疗卫生、能源政策、公共安全等领域的研究。 " }}
+						{{ thinkTank.describe }}
 					</div>
 					<div class="center-footer">
-						<div class="tag">{{ "国家安全" }}</div>
-						<div class="tag">{{ "科技政策" }}</div>
+						<div class="tag" v-for="tag in thinkTank.tags">{{ tag.industryName }}</div>
+
 					</div>
 				</div>
 				<!-- <div class="header-top-right">{{ '查看智库官网' }}</div> -->
@@ -58,19 +58,44 @@ import { ref, reactive, computed, onMounted } from "vue";
 import ThinkDaynamics from "./thinkDynamics/index.vue"
 import PolicyTracking from "./PolicyTracking/index.vue";
 import ThinkInfo from "./thinkInfo/index.vue";
+import {
+	getThinkTankSummary
+} from "@/api/thinkTank/overview";
+import { useRouter } from "vue-router";
 
-
+const router = useRouter();
 const tabActiveName = ref("智库动态");
 const switchTab = name => {
 	tabActiveName.value = name;
 };
 
+const thinkTank = ref({})
+// 获取智库基本信息
+const handleGetThinkTankSummary = async () => {
+	try {
+		const parmas = {
+			id: router.currentRoute._value.params.id
+		}
+		const res = await getThinkTankSummary(parmas);
+		console.log("智库信息", res);
+		if (res.code === 200 && res.data) {
+			thinkTank.value = res.data
+		}
+	} catch (error) {
+		console.error("获取智库列表error", error);
+	}
+};
+
+onMounted(async () => {
+	handleGetThinkTankSummary()
+});
 </script>
 
 <style lang="scss" scoped>
 .wrap {
 	width: 1920px;
 	height: 984px;
+
 	.header {
 		width: 1920px;
 		height: 188px;
@@ -81,18 +106,23 @@ const switchTab = name => {
 		box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 		background: rgba(255, 255, 255, 1);
 		position: relative;
+
 		.header-top {
 			margin-top: 24px;
 			display: flex;
+
 			.header-top-left {
 				width: 88px;
 				height: 88px;
 				background: purple;
 			}
+
 			.header-top-center {
 				margin-left: 22px;
+
 				.center-top {
 					display: flex;
+
 					.name {
 						height: 26px;
 						color: rgba(59, 65, 75, 1);
@@ -103,6 +133,7 @@ const switchTab = name => {
 						letter-spacing: 0px;
 						text-align: left;
 					}
+
 					.e-name {
 						margin-left: 11px;
 						height: 26px;
@@ -115,6 +146,7 @@ const switchTab = name => {
 						text-align: left;
 					}
 				}
+
 				.center-center {
 					margin-top: 4px;
 					width: 769px;
@@ -126,10 +158,12 @@ const switchTab = name => {
 					line-height: 24px;
 					letter-spacing: 0px;
 				}
+
 				.center-footer {
 					margin-top: 9px;
 					display: flex;
 					gap: 8px;
+
 					.tag {
 						height: 26px;
 						line-height: 26px;
@@ -148,6 +182,7 @@ const switchTab = name => {
 				}
 			}
 		}
+
 		.header-footer {
 			width: 340px;
 			height: 48px;
@@ -156,8 +191,9 @@ const switchTab = name => {
 			left: 160px;
 			display: flex;
 			gap: 24px;
+
 			.tab {
-				width: 92px;
+				width: 94px;
 				height: 48px;
 				display: flex;
 				align-items: center;
@@ -165,14 +201,17 @@ const switchTab = name => {
 				gap: 4px;
 				cursor: pointer;
 				border-bottom: 2px solid transparent;
+
 				.icon {
 					width: 16px;
 					height: 16px;
+
 					img {
 						width: 100%;
 						height: 100%;
 					}
 				}
+
 				.text {
 					height: 24px;
 					color: rgba(59, 65, 75, 1);
@@ -181,23 +220,28 @@ const switchTab = name => {
 					font-weight: 400;
 					line-height: 24px;
 				}
+
 				.textActive {
 					color: rgba(5, 95, 194, 1);
 					font-weight: 700;
 				}
 			}
+
 			.tabActive {
 				border-bottom: 2px solid rgba(5, 95, 194, 1);
 			}
 		}
 	}
+
 	.main {
 		margin: 0 auto;
 		width: 1600px;
+
 		.main-header {
 			height: 64px;
 			display: flex;
 			justify-content: space-between;
+
 			.search-box {
 				margin-top: 16px;
 				display: flex;
@@ -207,25 +251,30 @@ const switchTab = name => {
 				border: 1px solid rgba(230, 231, 232, 1);
 				border-radius: 4px;
 				background: rgba(255, 255, 255, 1);
+
 				.icon {
 					width: 16px;
 					height: 16px;
 					margin: 8px 7px;
 					cursor: pointer;
+
 					img {
 						width: 100%;
 						height: 100%;
 					}
 				}
 			}
+
 			.select-box {
 				margin-top: 16px;
 				margin-right: 5px;
 			}
 		}
+
 		.main-content {
 			display: flex;
 			gap: 16px;
+
 			.left {
 				width: 300px;
 				height: 806px;
@@ -235,11 +284,14 @@ const switchTab = name => {
 				box-shadow: 0px 0px 20px 0px rgba(94, 95, 95, 0.1);
 				background: rgba(255, 255, 255, 1);
 				position: relative;
+
 				.select-box {
 					margin-top: 21px;
+
 					.select-box-header {
 						display: flex;
 						gap: 17px;
+
 						.icon {
 							margin-top: 4px;
 							width: 8px;
@@ -247,6 +299,7 @@ const switchTab = name => {
 							background: var(--color-main-active);
 							border-radius: 0 4px 4px 0;
 						}
+
 						.title {
 							height: 24px;
 							color: var(--color-main-active);
@@ -258,39 +311,47 @@ const switchTab = name => {
 							text-align: left;
 						}
 					}
+
 					.select-main {
 						margin-left: 25px;
 					}
+
 					.select-main1 {
 						width: 100px;
 					}
 				}
 			}
+
 			.right {
 				width: 1284px;
 				height: 1377px;
+
 				.card-box {
 					width: 1284px;
 					height: 1248px;
 					display: flex;
 					justify-content: space-between;
 					flex-wrap: wrap;
+
 					.footer-card {
 						width: 418px;
 						height: 300px;
 						border-radius: 10px;
 						box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 						background: rgba(255, 255, 255, 1);
+
 						.footer-card-top {
 							width: 384px;
 							height: 206px;
 							margin: 0 auto;
 							margin-top: 15px;
+
 							img {
 								width: 100%;
 								height: 100%;
 							}
 						}
+
 						.footer-card-title {
 							margin: 0 auto;
 							margin-top: 13px;
@@ -302,6 +363,7 @@ const switchTab = name => {
 							font-weight: 700;
 							line-height: 24px;
 						}
+
 						.footer-card-footer {
 							margin: 0 auto;
 							margin-top: 5px;
@@ -317,10 +379,12 @@ const switchTab = name => {
 						}
 					}
 				}
+
 				.right-footer {
 					margin-top: 43px;
 					display: flex;
 					justify-content: space-between;
+
 					.info {
 						height: 19px;
 						color: rgba(132, 136, 142, 1);
@@ -341,6 +405,7 @@ const switchTab = name => {
 	box-shadow: none;
 	border-radius: 10px;
 }
+
 :deep(.el-input__wrapper:hover) {
 	box-shadow: none !important;
 }