解决冲突

src/views/bill/billHome/ResourceLibrarySection.vue

@@ -238,13 +238,8 @@
 									<!-- <div class="coop-summary" :title="item.desc">
 										{{ item.desc }}
 									</div> -->
-<<<<<<< HEAD
-									<div class="coop-count">
-										{{ `${item.proposalSize ?? (item.bills || []).length}项提案` }}
-=======
 									<div class="coop-count" @click="handleToDataLibrary(item)">
 										{{ `${item.proposalSize ?? (item.bills || []).length}项重点法案` }}
->>>>>>> 18083392db12b9588613923cb712b4bc23ba8adb
 									</div>
 								</div>
 								<div class="coop-proposals">

src/views/bill/billHome/index.vue

@@ -21,8 +21,8 @@
 					moreText="查看全部委员会"
 					:moreCardMinCount="1"
 					@time-click="handleCommitteeTimeClick"
-					@name-click="handleToInstitution"
-					@count-click="handleToDataLibrary"
+					@name-click="handleToDataLibrary"
+					@count-click="handleToBillDataLibrary"
 					@more-click="handleToCommitteeMore"
 				/>
 
@@ -106,7 +106,7 @@
 								</el-carousel>
 							</div>
 						</OverviewMainBox>
-						<RiskSignal :list="warningList" @more-click="handleToMoreRiskSignal" @item-click="handleRiskSignalItemToManage"
+						<RiskSignal :list="warningList" @more-click="handleToMoreRiskSignal" @item-click="handleClickToDetailO"
 							riskLevel="signalLevel" postDate="signalTime" name="signalTitle" />
 					</div>
 
@@ -238,18 +238,15 @@
 				<DivideHeader id="position4" class="divide4" :titleText="'资源库'"></DivideHeader>
 				<ResourceLibrarySection :on-click-to-detail="handleClickToDetailO" :on-after-page-change="handlePageChange" />
 			</div>
-			<RiskSignalOverviewDetailDialog v-model="isRiskOverviewDetailOpen" />
 		</div>
 	</div>
 </template>
 
 <script setup>
 import RiskSignal from "@/components/base/riskSignal/index.vue";
-import RiskSignalOverviewDetailDialog from "@/components/base/RiskSignalOverviewDetailDialog/index.vue";
 import SummaryCardsPanel from "@/components/base/SummaryCardsPanel/index.vue";
 import { onMounted, ref, onUnmounted, nextTick, watch, computed } from "vue";
 import router from "@/router/index";
-import { navigateToViewRiskSignal } from "@/utils/riskSignalOverviewNavigate";
 import setChart from "@/utils/setChart";
 import {
 	getBillIndustry,
@@ -472,15 +469,11 @@ const handleClickToDetailO = item => {
 	// router.push("/billLayout?billId=" + item.billId)
 };
 
-const isRiskOverviewDetailOpen = ref(false);
-
-const handleRiskSignalItemToManage = () => {
-	isRiskOverviewDetailOpen.value = true;
-};
-
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	navigateToViewRiskSignal(router);
+	const route = router.resolve("/viewRiskSignal");
+	window.open(route.href, "_blank");
+	// router.push("/viewRiskSignal")
 };
 
 // 查看更多新闻资讯（新闻主页）
@@ -1418,48 +1411,45 @@ const handleResize = () => {
 	box9ChartInstance && box9ChartInstance.resize();
 };
 
-// 跳转行政机构主页
-const handleToInstitution = item => {
-	window.sessionStorage.setItem("curTabName", item.orgName);
+// 下钻至资源库
+const handleToDataLibrary = (item) => {
+	const orgId = item?.orgId || item?.id;
+	if (!orgId) return;
+
+	window.sessionStorage.setItem("curTabName", item?.name || String(orgId));
 	const curRoute = router.resolve({
 		path: "/institution",
 		query: {
-			id: item.orgId
+			id: orgId
 		}
 	});
 	window.open(curRoute.href, "_blank");
-	// router.push({
-	// 	path: "/institution",
-	// 	query: {
-	// 		id: item.orgId
-	// 	}
-	// })
-};
 
-// 下钻至资源库
-const handleToDataLibrary = (item) => {
-
-	// window.sessionStorage.setItem("curTabName", item.id);
-	// const curRoute = router.resolve({
-	// 	path: "/institution",
-	// 	query: {
-	// 		id: item.id
+	// console.log('item', item);
+	// const selectParam = {
+	// 	selectedOrg: item.name,
+	// 	selectedCongress: item.chamber
 	// }
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/countryBill",
+	// 	query: selectParam
 	// });
-	// window.open(curRoute.href, "_blank");
+	// window.open(route.href, "_blank");
 
-	// console.log('item', item);
-	const selectParam = {
-		selectedOrg: item.name,
-		selectedCongress: item.chamber
-	}
+}
+
+// 法案数量下钻至数据资源库（与政令数量点击逻辑一致）
+const handleToBillDataLibrary = (item) => {
+	const selectedCongress = item?.subText === "双院" ? "全部议院" : (item?.subText || "");
 	const route = router.resolve({
 		path: "/dataLibrary/countryBill",
-		query: selectParam
+		query: {
+			selectedOrg: item?.name || "",
+			selectedCongress
+		}
 	});
 	window.open(route.href, "_blank");
-
-}
+};
 
 onMounted(async () => {
 	window.addEventListener("resize", handleResize);
@@ -1495,29 +1485,7 @@ onUnmounted(() => {
 
 	.search-header {
 		width: 100%;
-		// height: 144px;
-		background: var(--bg-white-100);
-
-		// overflow: hidden;
-		box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
-
-		.search-header-container {
-			width: 1600px;
-			margin: 0 auto;
-			padding: 16px 0px 16px 0px;
-		}
-
-		.home-content-header-center {
-			// margin-top: 20px;
-			// margin-left: 200px;
-			width: 800px;
-			height: 48px;
-			border-radius: 10px;
-			// box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
-			border: 1px solid var(--color-primary-35);
-			background: var(--bg-white-100);
-			box-sizing: border-box;
-			padding: 1px;
+		// heig		padding: 1px;
 			position: relative;
 
 			&:hover {
@@ -3203,8 +3171,6 @@ onUnmounted(() => {
 			}
 		}
 	}
-}
-
 :deep(.el-input__wrapper) {
 	box-shadow: none;
 	border-radius: 10px;