合并分支 'lzl-dev' 到 'master'

src/api/bill.js

@@ -139,4 +139,17 @@ export function getBillHyly(params) {
         url: `/api/billInfoBean/content/hyly/${params.id}`,
         params,
     })
+}
+
+// 根据法案ID获取法案全局信息
+/**
+ * @param {id} 
+ * @header token
+ */
+export function getBillInfoGlobal(params) {
+    return request({
+        method: 'GET',
+        url: `/api/billInfoBean/summary/${params.id}`,
+        params,
+    })
 }
\ No newline at end of file

src/views/bill/billLayout/index.vue

@@ -6,12 +6,12 @@
 				<div class="layout-main-header-left-box">
 					<div class="left-box-top">
 						<div class="icon">
-							<img src="./assets/images/USA-logo.png" alt="" />
+							<img :src="billInfoGlobal.imageUrl || USALogo" alt="" />
 						</div>
 						<div class="info">
-							<div class="info-box1">{{ "H.R.1(119th)-大而美法案" }}</div>
+							<div class="info-box1">{{ billInfoGlobal.billName }}</div>
 							<div class="info-box2">
-								{{ "第119届美国国会众议院第1号法案 One Big Beautiful Bill Act" }}
+								{{ billInfoGlobal.description }} {{ billInfoGlobal.billNameEn }}
 							</div>
 						</div>
 					</div>
@@ -35,8 +35,8 @@
 				</div>
 				<div class="layout-main-header-right-box">
 					<div class="right-box-top">
-						<div class="time">{{ "2025年7月" }}</div>
-						<div class="name">{{ "乔迪·阿灵顿（Jodey Arrington）​​ " }}</div>
+						<div class="time">{{ billInfoGlobal.introductionDate }}</div>
+						<div class="name">{{ billInfoGlobal.tarName }}</div>
 					</div>
 					<div class="right-box-bottom">
 						<!-- <el-button type="plain" size="large" icon="Search" @click="handleSwitchActiveName('法案原文')"
@@ -135,6 +135,7 @@
 <script setup>
 import { ref, onMounted } from "vue";
 import router from "@/router";
+import { getBillInfoGlobal } from "@/api/bill";
 
 import icon1 from "./assets/icons/icon1.png";
 import icon1Active from "./assets/icons/icon1_active.png";
@@ -144,9 +145,24 @@ import icon3 from "./assets/icons/icon3.png";
 import icon3Active from "./assets/icons/icon3_active.png";
 import icon4 from "./assets/icons/icon4.png";
 import icon4Active from "./assets/icons/icon4_active.png";
+import USALogo from "./assets/images/USA-logo.png";
 
 const activeName = ref("分析报告");
 
+// 获取法案全局信息
+const billInfoGlobal = ref({});
+const getBillInfoGlobalFn = async () => {
+	const res = await getBillInfoGlobal({
+		id: window.sessionStorage.getItem("billId")
+	});
+	if (res.code === 200) {
+		console.log("法案全局信息", res);
+		if (res.data) {
+			billInfoGlobal.value = res.data;
+		}
+	}
+};
+
 const handleSwitchActiveName = name => {
 	activeName.value = name;
 };
@@ -200,6 +216,7 @@ const handleClickMainHeaderBtn = item => {
 };
 
 onMounted(() => {
+	getBillInfoGlobalFn();
 	if (window.sessionStorage.getItem("activeTitle")) {
 		activeTitle.value = window.sessionStorage.getItem("activeTitle");
 	}
@@ -377,7 +394,7 @@ onMounted(() => {
 						margin-left: 9px;
 						.info-box1 {
 							color: rgba(59, 65, 75, 1);
-							font-family: Microsoft YaHei;
+							font-family: "Microsoft YaHei";
 							font-size: 20px;
 							font-weight: 600;
 							line-height: 22px;
@@ -387,16 +404,20 @@ onMounted(() => {
 						}
 						.info-box2 {
 							margin-top: 5px;
-							height: 22px;
+							// height: 22px;
 							line-height: 22px;
 							color: rgba(132, 136, 142, 1);
-
-							font-family: Microsoft YaHei;
+							font-family: "Microsoft YaHei";
 							font-size: 14px;
 							font-weight: 400;
 							line-height: 22px;
 							letter-spacing: 0px;
 							text-align: left;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+							text-overflow: ellipsis;
 						}
 					}
 				}

src/views/bill/influence/industry/index.vue

@@ -1092,6 +1092,19 @@ onMounted(async () => {
 					.dialog-box1-main {
 						margin-top: 4px;
 						margin-left: 18px;
+						max-height: 120px;
+						overflow-y: auto;
+						&::-webkit-scrollbar {
+							width: 4px;
+						}
+						&::-webkit-scrollbar-thumb {
+							border-radius: 10px;
+							background: rgba(0, 0, 0, 0.2);
+						}
+						&::-webkit-scrollbar-track {
+							border-radius: 0;
+							background: rgba(0, 0, 0, 0.1);
+						}
 						.item {
 							display: flex;
 							.item-left {
@@ -1107,13 +1120,16 @@ onMounted(async () => {
 							.item-right {
 								margin-top: 8px;
 								margin-left: 9px;
-								width: 420px;
+								width: 400px;
 								height: 22px;
 								color: rgba(132, 136, 142, 1);
 								font-family: Microsoft YaHei;
 								font-size: 14px;
 								font-weight: 400;
 								line-height: 22px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
 							}
 						}
 					}