update

src/views/decree/decreeHome/index.vue

@@ -795,7 +795,7 @@ const newsList = ref([
 ]);
 const handleGetNews = async () => {
 	const params = {
-		moduleId: "0100"
+		moduleId: "0101"
 	};
 	try {
 		const res = await getNews(params);
@@ -3047,9 +3047,12 @@ onMounted(async () => {
 						max-height: 1367px;
 						border-bottom: 1px solid rgba(234, 236, 238, 1);
 						overflow: hidden;
+						min-height: 790px;
 						.main-item {
 							display: flex;
-							height: 136px;
+							min-height: 100px;
+							// height: 136px;
+							// background: orange;
 							box-sizing: border-box;
 							padding-top: 10px;
 							cursor: pointer;
@@ -3084,7 +3087,7 @@ onMounted(async () => {
 										}
 									}
 									.line {
-										height: 112px;
+										height: 100%;
 										width: 2px;
 										background: #ddd;
 										margin-left: 11px;

src/views/decree/institution/insDetail/index.vue

@@ -4,7 +4,7 @@
 			<div class="box-header">
 				<div class="header-left"></div>
 				<div class="title">最新动态</div>
-				<div class="check-box"><el-checkbox :checked="isCrelated" label="只看涉华动态" /></div>
+				<div class="check-box"><el-checkbox v-model="isCrelated" label="只看涉华动态" /></div>
 				<div class="header-btn-box">
 					<div class="btn" :class="{ btnActive: dynamicsName === '机构动态' }" @click="handleClickBtn('机构动态')">
 						{{ "机构动态" }}
@@ -99,7 +99,18 @@
 					</div>
 					<div class="info-item">
 						<div class="info-item-left">{{ "下属机构：" }}</div>
+						<el-popover
+							v-if="basicInfo.xiashujigou.length > 72"
+							effect="dark"
+							:width="400"
+							:content="basicInfo.xiashujigou"
+							placement="top"
+						>
+							<template #reference>
 								<div class="info-item-right">{{ basicInfo.xiashujigou }}</div>
+							</template>
+						</el-popover>
+						<div v-else class="info-item-right">{{ basicInfo.xiashujigou }}</div>
 					</div>
 					<div class="info-item">
 						<div class="info-item-left">{{ "制裁手段：" }}</div>
@@ -113,7 +124,7 @@
 					<div class="user-content">
 						<div class="user-item" v-for="(item, index) in keyUser" :key="index">
 							<div class="user-item-left">
-								<img :src="item.avatarUrl?item.avatarUrl:DefaultIcon1" alt="" />
+								<img :src="item.avatarUrl ? item.avatarUrl : DefaultIcon1" alt="" />
 							</div>
 							<div class="user-item-right">
 								<div class="name">{{ item.name }}</div>
@@ -128,7 +139,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted } from "vue";
+import { ref, computed, onMounted,watch } from "vue";
 import { useRoute } from "vue-router";
 
 import Img from "./assets/images/img.png";
@@ -140,7 +151,7 @@ import DefaultIcon1 from "@/assets/icons/default-icon1.png";
 import DefaultIcon2 from "@/assets/icons/default-icon2.png";
 import { getGovOrgBasicInfo, getGovOrgLatestDynamics, getGovOrgKeyPerson } from "@/api/institution/index";
 
-const route = useRoute()
+const route = useRoute();
 
 // 基本信息
 const basicInfo = ref({
@@ -154,25 +165,20 @@ const basicInfo = ref({
 const handleGetBasicInfo = async () => {
 	const params = {
 		id: route.query.id
-	}
+	};
 	try {
-		const res = await getGovOrgBasicInfo(params)
-		console.log('基本信息', res);
-		if(res.code === 200 && res.data) {
-			basicInfo.value.image = res.data.logoUrl
-			basicInfo.value.shijian = res.data.establishmentDate
-			basicInfo.value.dizhi = res.data.address
-			basicInfo.value.zhize = res.data.orgIntroduction
-			basicInfo.value.xiashujigou = res.data.branchOrglist.toString()
-			basicInfo.value.zhicaishouduan = res.data.taglist.toString()
-
-		}
-		
-	} catch (error) {
-		
+		const res = await getGovOrgBasicInfo(params);
+		console.log("基本信息", res);
+		if (res.code === 200 && res.data) {
+			basicInfo.value.image = res.data.logoUrl;
+			basicInfo.value.shijian = res.data.establishmentDate;
+			basicInfo.value.dizhi = res.data.address;
+			basicInfo.value.zhize = res.data.orgIntroduction;
+			basicInfo.value.xiashujigou = res.data.branchOrglist.toString();
+			basicInfo.value.zhicaishouduan = res.data.taglist.toString();
 		}
-}
-
+	} catch (error) {}
+};
 
 // 关键人物
 const keyUser = ref([
@@ -284,13 +290,14 @@ const curList = computed(() => {
 });
 const handleClickBtn = name => {
 	dynamicsName.value = name;
+	handleGetLatestDynamics()
 };
 
 const handleGetLatestDynamics = async () => {
 	const params = {
 		orgId: route.query.id,
 		cRelated: isCrelated.value ? "Y" : "N",
-		dynamicsType: dynamicsName === '机构动态' ? "org" : "person",
+		dynamicsType: dynamicsName.value === "机构动态" ? "org" : "person",
 		currentPage: 1,
 		pageSize: 9999999
 	};
@@ -304,12 +311,18 @@ const handleGetLatestDynamics = async () => {
 	} catch (error) {}
 };
 
+watch(
+	() => isCrelated.value,
+	val => {
+		handleGetLatestDynamics()
+	}
+
+)
 
 onMounted(() => {
-handleGetLatestDynamics();
-handleGetBasicInfo()
-})
-
+	handleGetLatestDynamics();
+	handleGetBasicInfo();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -575,6 +588,8 @@ handleGetBasicInfo()
 						font-size: 16px;
 						font-weight: 400;
 						line-height: 24px;
+						max-height: 72px;
+						overflow: hidden;
 						letter-spacing: 0px;
 						text-align: left;
 					}

src/views/newsAnalysis/index.vue

@@ -15,10 +15,10 @@
 				</div>
 			</div>
 			<div class="page-header-right">
-				<el-button type="primary">
+				<!-- <el-button type="primary">
 					<el-image :src="openIcon" alt="打开" class="page-header-right-icon"></el-image>
 					查看原网页
-				</el-button>
+				</el-button> -->
 			</div>
 		</div>
 
@@ -37,11 +37,12 @@
 						<template #default>
 							<!-- 内容区域 - 分三块-->
 							<div class="page-content-news-abstract">
-								美国众议院共和党人正在起草一项新提案，以限制美国对中国的投资。此前，参议院已将其纳入国防政策立法中。知情人士向Semafor透露，众议院工作人员希望在11月7日前就该提案达成共识，并将财政部的反馈纳入由肯塔基州共和党众议员安迪·巴尔提出的配套提案中（尽管政府停摆可能推迟这一时间表）。随后，众议员将利用该文本与参议员就最终《国防授权法案》的内容进行协商。此前一届国会中，类似的尝试因北卡罗来纳州前众议员帕特里克·麦克亨利的反对而失败，但本届国会中，“所有人都在共同努力”。知情人士补充说，领导人并不担心此举会剥夺特朗普在周四与中国领导人习近平会谈时的谈判筹码，因为财政部已开始实施类似的指导方针。
+								
 							</div>
 							<div class="page-content-news-artical">
 								<div class="page-content-news-artical-zn">
-									<p>
+									{{ newsContentInfo.newsContent }}
+									<!-- <p>
 										据<span class="highlight">华盛顿邮报</span>报道，了解谈判情况的知情人士透露，<span
 											class="highlight"
 											>美国众议院</span
@@ -76,11 +77,11 @@
 									<p>
 										该人士还补充说，领导层并不担心此举会剥夺<span class="highlight">特朗普</span
 										><span class="highlight">总统</span>的一个谈判工具。
-									</p>
+									</p> -->
 								</div>
 
 								<div class="page-content-news-artical-en">
-									<p class="indented-paragraph">
+									<!-- <p class="indented-paragraph">
 										<span class="highlight">House Republicans</span> are drafting a fresh proposal to curb US
 										investments in China after the <span class="highlight">Senate</span> passed its bill as
 										part of defense policy legislation, people familiar with the talks told Semafor.
@@ -109,14 +110,14 @@
 										<span class="highlight">Trump</span> of a negotiating tool in talks with Chinese leader
 										<span class="highlight">Xi Jinping</span> on Thursday because
 										<span class="highlight">Treasury</span> is already implementing parallel guidance.
-									</p>
+									</p> -->
 								</div>
 							</div>
 
 							<div class="page-content-news-img">
-								<el-image :src="newsImg1" alt="新闻图片" fit="contain" />
-								<el-image :src="newsImg2" alt="新闻图片" fit="contain" />
-								<el-image :src="newsImg3" alt="新闻图片" fit="contain" />
+								<el-image :src="newsContentInfo.newsImage" alt="新闻图片" fit="contain" />
+								<!-- <el-image :src="newsImg2" alt="新闻图片" fit="contain" />
+								<el-image :src="newsImg3" alt="新闻图片" fit="contain" /> -->
 							</div>
 						</template>
 					</custom-container>
@@ -453,6 +454,7 @@ onMounted(() => {
 		text-indent: 2em;
 	}
 	&-news-artical {
+		height: 480px;
 		line-height: 1.8;
 		color: #303133;
 		display: flex;