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

src/views/bill/billHome/ResourceLibrarySection.vue

@@ -217,9 +217,9 @@ const props = defineProps({
 
 const tabList = ref([
 	{ name: "国会法案", active: true },
-	{ name: "国会议员", active: true },
+	{ name: "国会议员", active: false },
 	{ name: "议员合作关系", active: false },
-	{ name: "委员会", active: true }
+	{ name: "委员会", active: false }
 ]);
 const activeTabName = ref("国会法案");
 const handleClickTab = tab => {

src/views/bill/billHome/index.vue

@@ -329,7 +329,7 @@ const handleClickToDetailO = item => {
 
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	const route = router.resolve("/riskSignal");
+	const route = router.resolve("/viewRiskSignal");
 	window.open(route.href, "_blank");
 };
 // 风险信号

src/views/bill/billLayout/index.vue

@@ -283,7 +283,7 @@ onMounted(() => {
 			margin: 0 auto;
 			padding-top: 10px;
 			.layout-main-header-left-box {
-				width: 900px;
+				width: 2600px;
 				.left-box-top {
 					height: 64px;
 					display: flex;

src/views/bill/introdoction/STimeline.vue

@@ -16,10 +16,10 @@
 					>
 						<div class="item-title">{{ item.actionTitle }}</div>
 					</el-tooltip>
-					<div class="right">
+					<!-- <div class="right">
 						<div class="risk-tag" :class="item.riskClass">• {{ item.riskText }}</div>
 						<div class="arrow">></div>
-					</div>
+					</div> -->
 				</div>
 			</div>
 

src/views/bill/introdoction/index.vue

@@ -145,14 +145,14 @@
 				</div> -->
 				<AnalysisBox title="法案进展" :showAllBtn="false">
 					<template #header-btn>
-						<div class="progress-header-btns">
+						<!-- <div class="progress-header-btns">
 							<div class="btn" :class="{ btnActive: progressMode === 'latest' }" @click="handleSwitchProgressMode('latest')">
 								最新进展
 							</div>
 							<div class="btn" :class="{ btnActive: progressMode === 'early' }" @click="handleSwitchProgressMode('early')">
 								前期进程
 							</div>
-						</div>
+						</div> -->
 					</template>
 					<div class="box2-main">
 						<div class="box2-main-center">

src/views/coopRestriction/components/dataNew/index.vue

@@ -207,7 +207,7 @@ const handleToRiskDetail = (item) => {
 
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	const route = router.resolve("/riskSignal");
+	const route = router.resolve("/vieRiskSignal");
 	window.open(route.href, "_blank");
 };
 

src/views/decree/decreeHome/index.vue

@@ -534,7 +534,7 @@ handleGetDepartmentList();
 
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	const route = router.resolve("/riskSignal");
+	const route = router.resolve("/viewRiskSignal");
 	window.open(route.href, "_blank");
 };
 

src/views/exportControl/index.vue

@@ -1570,7 +1570,7 @@ const handleSanc = item => {
 
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	const route = router.resolve("/riskSignal");
+	const route = router.resolve("/viewRiskSignal");
 	window.open(route.href, "_blank");
 };
 

src/views/finance/index.vue

@@ -550,7 +550,7 @@ const messageList = ref([
 ]);
 // 查看更多风险信号
 const handleToMoreRiskSignal = () => {
-	const route = router.resolve("/riskSignal");
+	const route = router.resolve("/viewRiskSignal");
 	window.open(route.href, "_blank");
 };
 

vite.config.js

@@ -89,7 +89,8 @@ export default defineConfig({
         rewrite: (path) => path.replace(/^\/temporarySearch/, '')
       },
       '^/bill(?:/|$)': {
-        target: 'http://172.20.10.3:28080/',
+        target: 'http://8.140.26.4:9085/',
+        // target: 'http://172.20.10.3:28080/',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/bill/, '')
       },