合并分支 'zym-dev' 到 'pre'

src/views/bill/billLayout/assets/icons/forsee-icon.svg

+<svg viewBox="0 0 12 13" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.000000" height="13.000000" fill="none" customFrame="#000000">
+	<path id="矢量 1651" d="M8.05031 2.15239e-07C8.33835 2.69049e-07 8.61901 0.0965686 8.85205 0.275865C9.08508 0.455161 9.25853 0.70798 9.34755 0.998087C9.43656 1.28819 9.43656 1.6007 9.34755 1.8908C9.25853 2.18091 9.08508 2.43373 8.85205 2.61303C8.61901 2.79232 8.33835 2.88889 8.05031 2.88889L3.9583 2.88889C3.69558 2.88873 3.43848 2.80821 3.21793 2.65703C2.99737 2.50585 2.82274 2.29043 2.71502 2.03667C2.35984 2.08328 2.0252 2.23849 1.752 2.48332C1.4788 2.72814 1.27889 3.05197 1.17673 3.41519C1.07456 3.77842 1.07456 4.1653 1.17673 4.52853C1.27889 4.89176 1.4788 5.21558 1.752 5.46041C2.0252 5.70523 2.35984 5.86044 2.71502 5.90706C2.82284 5.65343 2.99751 5.43816 3.21806 5.28711C3.43861 5.13606 3.69565 5.05566 3.9583 5.05556L8.05031 5.05556C8.31755 5.05563 8.57888 5.13883 8.80185 5.29483C9.02483 5.45084 9.19961 5.67276 9.3045 5.93306C9.88944 5.98317 10.4467 6.21802 10.9042 6.60722C11.3618 6.99642 11.6985 7.52206 11.8708 8.11613C12.0431 8.7102 12.0431 9.34536 11.8708 9.93943C11.6985 10.5335 11.3618 11.0591 10.9042 11.4483C10.4467 11.8375 9.88944 12.0724 9.3045 12.1225C9.19961 12.3828 9.02483 12.6047 8.80185 12.7607C8.57888 12.9167 8.31755 12.9999 8.05031 13L3.9583 13C3.71881 13.0001 3.48352 12.9334 3.27608 12.8067C3.06865 12.6799 2.89638 12.4976 2.77661 12.2779C2.65684 12.0583 2.59378 11.8092 2.59378 11.5556C2.59378 11.3019 2.65684 11.0528 2.77661 10.8332C2.89638 10.6136 3.06865 10.4312 3.27608 10.3044C3.48352 10.1777 3.71881 10.111 3.9583 10.1111L8.05031 10.1111C8.60409 10.1111 9.07944 10.4607 9.29291 10.9626C9.64884 10.9171 9.98445 10.7624 10.2585 10.5177C10.5326 10.273 10.7333 9.94881 10.8358 9.58501C10.9384 9.22121 10.9384 8.83362 10.8358 8.46982C10.7333 8.10603 10.5326 7.78186 10.2585 7.53714C9.98445 7.29241 9.64884 7.13778 9.29291 7.09222C9.18531 7.34593 9.0108 7.56132 8.79036 7.71251C8.56992 7.86369 8.31294 7.94423 8.05031 7.94444L3.9583 7.94444C3.69087 7.94445 3.42933 7.86121 3.20622 7.70506C2.9831 7.54892 2.80826 7.32676 2.70342 7.06622C2.11732 7.01784 1.55849 6.78394 1.09952 6.39491C0.640554 6.00587 0.302655 5.47968 0.129709 4.88468C-0.0432364 4.28967 -0.0432363 3.65334 0.129709 3.05833C0.302654 2.46332 0.640554 1.93713 1.09952 1.54809C1.55849 1.15906 2.11732 0.925163 2.70342 0.876778C2.80847 0.616508 2.9834 0.394654 3.2065 0.238777C3.4296 0.0829001 3.69102 -0.000130273 3.9583 2.15239e-07L8.05031 2.15239e-07Z" fill="rgb(95,101,108)" fill-rule="nonzero" />
+</svg>

src/views/bill/billLayout/assets/icons/writting-icon.svg

+<svg viewBox="0 0 12 13.3145" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.000000" height="13.314453" fill="none" customFrame="#000000">
+	<path id="矢量 52" d="M2.47123 9.11862L8.566 3.02386C8.82631 2.76355 8.82631 2.3415 8.566 2.08119C8.30569 1.82088 7.88364 1.82088 7.62333 2.08119L1.52857 8.17595C1.40356 8.30096 1.33333 8.4705 1.33333 8.64729C1.33333 9.01542 1.63176 9.31385 1.9999 9.31385C2.17668 9.31385 2.34623 9.24363 2.47123 9.11862ZM2.82867 10.6472L1 10.6472C0.447715 10.6472 0 10.1995 0 9.64719L0 8.23273C0 7.96752 0.105357 7.71316 0.292894 7.52563L7.62333 0.195193C7.74833 0.0702133 7.91787 0 8.09467 0C8.27147 0 8.441 0.0702133 8.566 0.195193L10.452 2.08119C10.577 2.20621 10.6472 2.37575 10.6472 2.55253C10.6472 2.7293 10.577 2.89884 10.452 3.02386L2.82867 10.6472L2.82867 10.6472ZM0.666666 11.9805L11.3333 11.9805C11.7015 11.9805 12 12.279 12 12.6472C12 13.0154 11.7015 13.3139 11.3333 13.3139L0.666667 13.3139C0.298477 13.3139 0 13.0154 0 12.6472C0 12.279 0.298477 11.9805 0.666666 11.9805Z" fill="rgb(255,255,255)" fill-rule="evenodd" />
+</svg>

src/views/bill/billLayout/components/BillHeader.vue

@@ -38,13 +38,9 @@
 						</div>
 					</template>
 					<template v-else>
-						<div
-							class="left-box-bottom-item"
-							:class="{ leftBoxBottomItemActive: activeTitle === item.name }"
-							v-for="item in tabs"
-							:key="item.path"
-							@click="emit('tab-click', item)"
-						>
+						<div class="left-box-bottom-item"
+							:class="{ leftBoxBottomItemActive: activeTitle === item.name }" v-for="item in tabs"
+							:key="item.path" @click="emit('tab-click', item)">
 							<div class="icon">
 								<img v-if="activeTitle === item.name" :src="item.activeIcon" alt="" />
 								<img v-else :src="item.icon" alt="" />
@@ -88,7 +84,13 @@
 						</div>
 					</template>
 					<template v-else>
-						<div class="btn3" @click="emit('open-analysis')">
+						<div class="btn2" @click="emit('open-analysis', 'forsee')">
+							<div class="icon">
+								<img :src="btnIconForsee" alt="" />
+							</div>
+							<div class="text">{{ "进展预测" }}</div>
+						</div>
+						<div class="btn3" @click="emit('open-analysis', 'analysis')">
 							<div class="icon">
 								<img :src="btnIconAnalysis" alt="" />
 							</div>
@@ -103,7 +105,8 @@
 
 <script setup>
 import { computed } from "vue";
-import btnIconAnalysis from "@/views/thinkTank/ReportDetail/images/btn-icon3.png";
+import btnIconAnalysis from "@/views/bill/billLayout/assets/icons/writting-icon.svg";
+import btnIconForsee from "@/views/bill/billLayout/assets/icons/forsee-icon.svg";
 
 const props = defineProps({
 	billInfo: {
@@ -347,6 +350,29 @@ const emit = defineEmits(["tab-click", "open-analysis"]);
 			justify-content: flex-end;
 			gap: 8px;
 
+			.icon {
+				width: 16px;
+				height: 16px;
+
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.btn2 {
+				cursor: pointer;
+				width: 120px;
+				height: 36px;
+				border-radius: 6px;
+				background: var(--bg-white-100);
+				border: 1px solid var(--bg-black-10);
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				gap: 8px;
+			}
+
 			.btn3 {
 				cursor: pointer;
 				width: 120px;
@@ -358,16 +384,6 @@ const emit = defineEmits(["tab-click", "open-analysis"]);
 				align-items: center;
 				gap: 8px;
 
-				.icon {
-					width: 16px;
-					height: 16px;
-
-					img {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
 				.text {
 					height: 24px;
 					color: rgba(255, 255, 255, 1);
@@ -387,4 +403,3 @@ const emit = defineEmits(["tab-click", "open-analysis"]);
 	}
 }
 </style>
-

src/views/bill/billLayout/index.vue

@@ -2,16 +2,9 @@
 	<div class="layout-container">
 		<!-- 导航菜单 -->
 		<div class="layout-main">
-			<BillHeader
-				:billInfo="billInfoGlobal"
-				:defaultLogo="USALogo"
-				:tabs="mainHeaderBtnList"
-				:activeTitle="activeTitle"
-				:showTabs="showHeaderTabs"
-				:showActions="showHeaderActions"
-				@tab-click="handleClickMainHeaderBtn"
-				@open-analysis="handleAnalysisClick"
-			/>
+			<BillHeader :billInfo="billInfoGlobal" :defaultLogo="USALogo" :tabs="mainHeaderBtnList"
+				:activeTitle="activeTitle" :showTabs="showHeaderTabs" :showActions="showHeaderActions"
+				@tab-click="handleClickMainHeaderBtn" @open-analysis="handleAnalysisClick" />
 
 			<div class="layout-main-center">
 				<router-view />
@@ -115,12 +108,24 @@ const handleClickMainHeaderBtn = item => {
 	});
 };
 
-const handleAnalysisClick = () => {
+const handleAnalysisClick = analysisType => {
+	const billId = route.query.billId;
+	if (!billId) return;
+
+	// 进展预测 -> 法案简介页（法案进展）
+	if (analysisType === "forsee") {
+		router.push({
+			path: `/billLayout/ProgressForecast/${billId}`,
+		});
+		return;
+	}
+
+	// 分析报告 -> 写作助手
 	router.push({
 		path: "/writtingAsstaint",
 		query: {
 			topic: "法案",
-			fileId: route.query.billId
+			fileId: String(billId)
 		}
 	});
 };
@@ -149,11 +154,13 @@ watch(
 	// height: 1016px;
 	background: rgba(249, 250, 252, 1);
 	position: relative;
+
 	// margin: 0 auto;
 	.layout-main {
 		width: 100%;
-		height: calc(100vh - 72px);
+		height: 100vh;
 		overflow-y: auto;
+
 		.layout-main-center {
 			// height: calc(100% - 137px);
 			width: 1600px;