Merge branch 'pre' of http://8.140.26.4:10003/caijian/risk-monitor into yp-dev

src/components/base/Ai/AiSummary/index.vue

@@ -46,6 +46,7 @@
       img {
         width: 100%;
         height: 100%;
+        display: block;
       }
     }
 

src/components/base/moduleHeader/index.vue

@@ -37,7 +37,7 @@
 						<div class="icon">
 							<img :src="item.icon" alt="" />
 						</div>
-						<div class="title">{{ item.title }}</div>
+						<div class="title" :class="{ 'active-title': item.active }">{{ item.title }}</div>
 					</div>
 				</div>
 			</div>
@@ -157,57 +157,68 @@ const menuList = ref([
 	{
 		title: "科技法案",
 		icon: Menu2,
-		path: "/billHome"
+		path: "/billHome",
+		active: false
 	},
 	{
 		title: "科技政令",
 		icon: Menu3,
-		path: "/decree"
+		path: "/decree",
+		active: false
 	},
 	{
 		title: "美国科技智库",
 		icon: Menu4,
-		path: "/thinkTank"
+		path: "/thinkTank",
+		active: false
 	},
 	{
 		title: "出口管制",
 		icon: Menu5,
-		path: "/exportControl"
+		path: "/exportControl",
+		active: false
 	},
 	{
 		title: "科研合作限制",
 		icon: Menu6,
-		path: "/cooperationRestrictions"
+		path: "/cooperationRestrictions",
+		active: false
 	},
 	{
 		title: "投融资限制",
 		icon: Menu7,
-		path: "/finance"
+		path: "/finance",
+		active: false
 	},
 	{
 		title: "市场准入限制",
 		icon: Menu8,
-		path: "/marketAccessRestrictions"
+		path: "/marketAccessRestrictions",
+		active: false
 	},
 	{
 		title: "规则限制",
 		icon: Menu9,
-		path: "/ruleRestrictions"
+		path: "/ruleRestrictions",
+		active: false
 	},
 	{
 		title: "美国科技人物观点",
 		icon: Menu10,
-		path: "/technologyFigures"
+		path: "/technologyFigures",
+		active: false
 	},
 	{
 		title: "美国主要创新主体动向",
 		icon: Menu11,
-		path: "/innovationSubject"
+		path: "/innovationSubject",
+		active: false
 	},
 	{
 		title: "美国科研资助体系",
 		icon: Menu12,
-		path: "/scientificFunding"
+		path: "/scientificFunding",
+		active: false
 	}
 ]);
 
@@ -235,6 +246,7 @@ const handleToModule = (item, index) => {
 	window.sessionStorage.setItem('homeActiveTitleIndex', index)
 	if (index === 1) {
 		homeActiveTitleIndex.value = index
+		item.active = true
 		router.push({
 			path: item.path
 		})
@@ -497,6 +509,11 @@ onUnmounted(() => {
 						letter-spacing: 0px;
 						text-align: left;
 					}
+
+					.active-title {
+						color: var(--color-main-active) !important;
+						font-size: 20px !important;
+					}
 				}
 			}
 		}
@@ -528,6 +545,8 @@ onUnmounted(() => {
 					display: flex;
 					cursor: pointer;
 
+
+
 					&:hover {
 						.title {
 							color: var(--color-main-active);
@@ -557,6 +576,11 @@ onUnmounted(() => {
 						letter-spacing: 0px;
 						text-align: left;
 					}
+
+					.active-title {
+						color: var(--color-main-active) !important;
+						font-size: 20px !important;
+					}
 				}
 			}
 		}

src/components/intelligenceLeftTabBar/index.vue

+<template>
+	<div class="intelligenceLeftTabBar">
+        <div class="navBox" :class="{navBoxShow:isNavMenuShow}">
+            <div class="navList" v-for="(item,index) in navList " :key="index" :class="{on:navPath==item.path}" @click="onNavListClick(item.path)">
+                <div class="icon" :style="{background:`url(${item.img})no-repeat`,backgroundSize:'24px 24px',backgroundPosition:'17px 17px'}"></div>
+                <span class="text-tip-1" style="white-space: nowrap; ">{{ item.name }}</span>
+            </div>
+        </div>
+
+        <img class="show" src="@/assets/icons/muenShow.png" :style="isNavMenuShow?'transform: scaleX(1)':''" alt="" @click="()=>{isNavMenuShow=!isNavMenuShow}">
+	</div>
+</template>
+
+<script setup>
+import muen1 from '@/assets/icons/tool-item-icon1.png'
+import muen2 from '@/assets/icons/tool-item-icon2.png'
+import muen3 from '@/assets/icons/tool-item-icon3.png'
+import muen4 from '@/assets/icons/tool-item-icon4.png'
+
+import { onMounted, onUnmounted, ref, nextTick } from "vue";
+import { useRoute } from "vue-router";
+import { ElMessage } from "element-plus";
+import { useWrittingAsstaintStore } from "@/stores/writtingAsstaintStore";
+const isNavMenuShow=ref(false)
+const navList=ref([
+    {
+        img:muen1,
+        path:'/writtingAsstaint',
+        name:'智能写报'
+    },
+    {
+        img:muen2,
+        path:'/writtingAsstaint1',
+        name:'智能翻译'
+    },
+    {
+        img:muen3,
+        path:'/writtingAsstaint2',
+        name:'智能查询'
+    },
+    {
+        img:muen4,
+        path:'/writtingAsstaint3',
+        name:'智能对话'
+    },
+])
+const navPath=ref()
+const route=useRoute()
+if(route.path){
+    navPath.value=route.path
+}
+const onNavListClick=(path)=>{
+    if(path=='/writtingAsstaint'){
+        navPath.value=path
+    }else{
+        ElMessage.error('正在开发中')
+    }
+}
+</script>
+<style lang="scss" scoped>
+.intelligenceLeftTabBar{
+    padding: 5px 0;
+     border-right: 1px solid rgb(234, 236, 238);
+     position: relative;
+    .navBox{
+        height: 100%;
+        width: 65px;
+        transition: all 0.3s;
+        padding: 0 3px;
+        .navList{
+            display: flex;
+            align-items: center;
+            cursor: pointer;
+            border-radius: 8px;
+            overflow: hidden;
+            height: 60px;
+            .icon{
+                width: 60px;
+                height: 60px;
+                flex-shrink: 0;
+                border-radius: 10px;
+                margin-right: 15px;
+            }
+        }
+        .on{
+            background-color: var(--color-primary-10);
+            color: var(--color-primary-100);
+            font-weight: Bold;
+        }
+    }
+    .navBoxShow{
+        width: 200px;
+        transition: all 0.3s;
+    }
+    .show{
+        position: absolute;
+        width: 24px;
+        height: 24px;
+        right: 21px;
+        bottom: 21px;
+        cursor: pointer;
+        transform: scaleX(-1)
+    }
+}
+
+
+</style>
\ No newline at end of file

src/hooks/useMarkdownStream.js

@@ -295,12 +295,15 @@ export function useMarkdownStream() {
     // 预处理内容
     // const processedContent = preprocessMarkdown(rawContent.value)
     let content = rawContent.value || ''
-    
     // 将 ==n== 转换为按钮样式的 HTML
     // 使用正向预读和反向预读确保只匹配被 == 包裹的数字
-    content = content.replace(/==(\d+)==/g, (match, p1) => {
-      return `<button class="clause-ref-btn" data-clause="${p1}">${p1}</button>`
-    })
+    // content = content.replace(/==(\d+)、==/g, (match, p1) => {
+    //   return `<button class="clause-ref-btn" data-clause="${p1}">${p1}</button>`
+    // })
+  console.log(content,11223)
+    content = content.replace(/==\s*(\d+)、.*?==/g, (match, p1) => {
+      return `<button class="clause-ref-btn" data-clause="${match.replace(/==/g, '') }">${p1}</button>`;
+    });
     
     return md.render(content)
   })

src/router/modules/thinktank.js

@@ -2,6 +2,8 @@
 const thinkTank = () => import('@/views/thinkTank/index.vue')
 const ThinkTankDetail = () => import('@/views/thinkTank/ThinkTankDetail/index.vue')
 const ReportDetail = () => import('@/views/thinkTank/ReportDetail/index.vue')
+const SurveyProjectView  = () => import('@/views/thinkTank/SurveyProjectView/index.vue')
+const CongressHearingView  = () => import('@/views/thinkTank/CongressHearingView/index.vue')
 const ReportOriginal = () => import('@/views/thinkTank/reportOriginal/index.vue')
 const allThinkTank= () => import('@/views/thinkTank/allThinkTank/index.vue')
 const MultiThinkTankViewAnalysis= () => import('@/views/thinkTank/MultiThinkTankViewAnalysis/index.vue')
@@ -40,6 +42,16 @@ const thinktankRoutes = [
     name: "ReportOriginal",
     component: ReportOriginal,
   
+  },
+  {
+  path: "/thinkTank/SurveyProjectView/:id",
+    name: "SurveyProjectView",
+    component: SurveyProjectView,
+  },
+   {
+  path: "/thinkTank/CongressHearingView/:id",
+    name: "CongressHearingView",
+    component: CongressHearingView,
   },
    {
     path: "/thinkTank/allThinkTank",

src/utils/getQuarterRange.js

+const getQuarterRange = (quatarNum) => {
+  const quarters = {
+    1: ['2025-01-01', '2025-03-31'],
+    2: ['2025-04-01', '2025-06-30'],
+    3: ['2025-07-01', '2025-09-30'],
+    4: ['2025-10-01', '2025-12-31']
+  };
+  
+  return quarters[quatarNum];
+}
+
+export default getQuarterRange
\ No newline at end of file

src/utils/setChart.js

 // 绘制echarts图表
 import getMonthRange from './getMonthRange'
+import getQuarterRange from './getQuarterRange';
 import * as echarts from 'echarts'
 import 'echarts-wordcloud';
 import router from '@/router/index'
@@ -77,6 +78,26 @@ const setChart = (option, chartId, allowClick, selectParam) => {
             }
 
           }
+          break
+
+        case '政令':
+          if (params.componentType === 'series' && params.seriesType === 'pie') {
+            selectParam.domains = params.name
+            const route = router.resolve({
+              path: "/dataLibrary/dataDecree",
+              query: selectParam
+            });
+            window.open(route.href, "_blank");
+          } else if (params.componentType === 'series' && params.seriesType === 'bar') {
+
+            const quatarNum = Number(params.name[params.name.length - 1])
+            selectParam.selectedDate = JSON.stringify(getQuarterRange(quatarNum))
+            const route = router.resolve({
+              path: "/dataLibrary/dataDecree",
+              query: selectParam
+            });
+            window.open(route.href, "_blank");
+          }
 
       }
 

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;

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

@@ -25,8 +25,8 @@
                 </div>
             </div>
         </div> -->
-        <NewsList :newsList="leftList" @item-click="handleToNewsDetail" @more-click="handleToMoreNews" img="image"
-            title="title" content="content" from="from" />
+        <NewsList :newsList="leftList" @item-click="item => gotoNewsDetail(item.id)" @more-click="handleToMoreNews"
+            img="image" title="title" content="content" from="from" />
         <MessageBubble :messageList="rightList" imageUrl="personImage" @more-click="handleToSocialDetail"
             @person-click="handleToSocialDetail" name="name" content="content" source="orgName" image-url="image" />
         <!-- <div class="right">
@@ -60,6 +60,8 @@ import title03 from './assets/title03.png'
 import title01bg from './assets/title01bg.png'
 import title02bg from './assets/title02bg.png'
 import title03bg from './assets/title03bg.png'
+import { useGotoNewsDetail } from '@/router/modules/news';
+const gotoNewsDetail = useGotoNewsDetail()
 
 // 合作限制-查询社交媒体接口
 const getCoopRestrictionSocialData = async () => {

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

@@ -12,7 +12,7 @@
 			<el-carousel ref="carouselRef" height="412px" direction="horizontal" :autoplay="true" :interval="5000"
 				arrow="never" indicator-position="none" @change="handleCarouselChange">
 				<el-carousel-item v-for="(item, index) in coopRestrictionTrends" :key="item.ID || index">
-					<div class="carousel-item-content">
+
 					<div class="left-center">
 						<img :src="item.IMAGEURL || defaultImg" alt="" />
 						<div class="left-center-main">
@@ -44,7 +44,9 @@
 									</li>
 								</ul>
 							</div>
+
 						</div>
+						<div class="left-center-type" v-if="item.type">{{ item.type }}</div>
 						<!-- <div class="left-center-title">{{ item.LIMITTYPE }}</div> -->
 					</div>
 					<div class="left-bottom">
@@ -55,7 +57,7 @@
 							{{ item.INTRODUCTION || "暂无内容摘要" }}
 						</div>
 					</div>
-					</div>
+
 				</el-carousel-item>
 
 				<!-- 无数据时的占位展示 -->
@@ -108,6 +110,7 @@
 				查看更多
 			</div>
 		</div> -->
+
 		<RiskSignal :list="riskSignals" @more-click="handleToMoreRiskSignal" postDate="time" name="content"
 			riskLevel="title" @item-click="handleClickToDetail" />
 	</div>
@@ -233,7 +236,7 @@ onMounted(() => {
 
 	.left {
 		width: 1064px;
-		height: 460px;
+		height: 450px;
 		margin-right: 16px;
 		border-radius: 10px;
 		background-color: #fff;
@@ -330,6 +333,7 @@ onMounted(() => {
 			.left-center-main {
 				width: 439px;
 				height: 175px;
+				position: relative;
 
 				.left-center-main-title {
 					margin-left: 19px;
@@ -420,6 +424,29 @@ onMounted(() => {
 						}
 					}
 				}
+
+
+			}
+
+			.left-center-type {
+				position: absolute;
+				top: 0;
+				right: 0;
+				height: 32px;
+				font-family: "Source Han Sans CN";
+				font-weight: 700;
+				font-size: 18px;
+				line-height: 24px;
+				letter-spacing: 0px;
+				text-align: left;
+				color: rgb(5, 95, 194);
+				background-color: rgb(231, 243, 255);
+				align-items: center;
+				border-radius: 4px;
+				padding-left: 8px;
+				padding-right: 8px;
+				padding-top: 3px;
+				padding-bottom: 5px;
 			}
 
 			.left-center-title {
@@ -439,7 +466,7 @@ onMounted(() => {
 		}
 
 		.left-bottom {
-			margin: 17px 0 0 62px;
+			margin: 17px 0 0 59px;
 
 			ul {
 				list-style-position: inside;

src/views/coopRestriction/index.vue

@@ -15,7 +15,8 @@
 		<div class="main-content" ref="homeMainRef" :class="{ 'scroll-main': isShow }">
 			<div class="home-top-bg"></div>
 			<!-- 搜索栏部分 -->
-			<SearchContainer v-if="homeMainRef" placeholder="搜索合作限制" :containerRef="homeMainRef" areaName="" />
+			<SearchContainer v-if="homeMainRef" :countInfo="cooperationCountInfo" placeholder="搜索合作限制"
+				:containerRef="homeMainRef" areaName="" />
 
 			<!-- 最新动态 -->
 			<div class="newdata" id="position1">
@@ -57,9 +58,36 @@ import newData from "./components/dataNew/index.vue";
 import askPage from "./components/askPage/index.vue";
 import dataSub from "./components/dataSub/index.vue";
 import resLib from "./components/resLib/index.vue";
+import { getCoopRestrictionStatistics } from "@/api/coopRestriction/coopRestriction.js";
 
 import { useContainerScroll } from "@/hooks/useScrollShow";
-
+const cooperationCountInfo = ref([]);
+// const
+const getCooperationCountInfo = async () => {
+	try {
+		const res = await getCoopRestrictionStatistics();
+		if (res && res.code === 200) {
+			// console.log('----getStatCountInfo', res.data)
+			cooperationCountInfo.value = [
+				{
+					name: "相关法案",
+					count: res.data.billCounts
+				},
+				{
+					name: "相关政令",
+					count: res.data.aocounts
+				},
+				{
+					name: "相关政府公告",
+					count: res.data.ggcounts
+				},
+
+			];
+		}
+	} catch (error) {
+		console.error("获取首页统计接口失败:", error);
+	}
+};
 // 搜索框
 const input = ref("");
 const homeMainRef = ref(null);
@@ -71,7 +99,9 @@ const router = useRouter();
 const handleSearch = () => {
 	console.log("搜索内容：", input.value);
 };
-
+onMounted(() => {
+	getCooperationCountInfo();
+});
 // 锚点跳转
 const handleToPosi = id => {
 	const element = document.getElementById(id);
@@ -106,6 +136,7 @@ const handleToPosi = id => {
 .coop-page {
 	width: 100%;
 	height: 100%;
+	display: flex;
 	// .breadcrumb {
 	// 	width: 100%;
 	// 	height: 64px;
@@ -138,6 +169,12 @@ const handleToPosi = id => {
 			top: -64px;
 		}
 
+		:deep(.search-container .search-center) {
+			width: 440px;
+			gap: 40px;
+			justify-content: center;
+		}
+
 		.search {
 			width: 960px;
 			height: 168px;
@@ -467,8 +504,6 @@ const handleToPosi = id => {
 		}
 	}
 
-	.scroll-main {
-		height: calc(100% - 144px) !important;
-	}
+
 }
 </style>

src/views/dataLibrary/bill/countryBill/index.vue

@@ -151,7 +151,7 @@
 </template>
 
 <script setup>
-import { ref, computed, watch, onMounted, nextTick } from 'vue'
+import { ref, computed, watch, onMounted, nextTick, onBeforeUnmount } from 'vue'
 import ChartContainer from '../../components/ChartContainer/index.vue'
 import ChartHeader from '../../components/ChartHeader/index.vue'
 import ActiveTag from '../../components/ActiveTag/index.vue'
@@ -171,6 +171,10 @@ import getDateRange from '@/utils/getDateRange'
 
 const route = useRoute();
 
+const timer1 = ref(null)
+const timer2 = ref(null)
+const timer3 = ref(null)
+
 // 图表/数据
 const isShowChart = ref(false)
 // 点击切换数据/图表
@@ -180,7 +184,7 @@ const handleSwitchChartData = () => {
     const curDemensionItem = staticsDemensionList.value.filter(item => {
       return item.name === curDemension.value
     })[0]
-    setTimeout(() => {
+    timer1.value = setTimeout(() => {
       activeChart.value = curDemensionItem.chartTypeList[0]
       curChartData.value = curDemensionItem.data
     })
@@ -267,7 +271,7 @@ const handleClickDemensionItem = (val) => {
   })
   val.active = true
   curDemension.value = val.name
-  setTimeout(() => {
+  timer2.value = setTimeout(() => {
     activeChart.value = val.chartTypeList[0]
     curChartData.value = val.data
   })
@@ -702,8 +706,8 @@ const statusList = ref([
     id: '参议院通过'
   },
   {
-    name: '双院通过',
-    id: '双院通过'
+    name: '分歧已解决',
+    id: '分歧已解决'
   },
 ])
 
@@ -778,8 +782,8 @@ const selectedCount = computed(() => selectedMap.value.size)
 
 // 获取表格数据（示例）
 const fetchTableData = async () => {
-  isSelectedAll.value = false
-  selectedMap.value.clear()
+  // isSelectedAll.value = false
+  // selectedMap.value.clear()
   // 调用接口获取数据...
   const params = {
     page: currentPage.value,
@@ -793,8 +797,8 @@ const fetchTableData = async () => {
     originChamber: selectedCongress.value === '全部议院' ? null : selectedCongress.value,
     originDepart: selectedOrg.value === '全部委员会' ? null : selectedOrg.value,
     sponsorPersonName: selectedmember.value === '全部议员' ? null : selectedmember.value,
-    status: selectedStatus.value === '通过' ? 1 : 0,
-    isInvolveCn: isInvolveCn ? 'Y' : 'N',
+    status: selectedStatus.value === '全部阶段' ? null : selectedStatus.value,
+    isInvolveCn: isInvolveCn.value ? 'Y' : 'N',
     sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
   }
   try {
@@ -836,7 +840,7 @@ const fetchTableData = async () => {
       return item.name === curDemension.value
     })[0]
 
-    setTimeout(() => {
+    timer3.value = setTimeout(() => {
       activeChart.value = curDemensionItem.chartTypeList[0]
       curChartData.value = curDemensionItem.data
     })
@@ -877,7 +881,7 @@ const fetchAllData = async () => {
     originDepart: selectedOrg.value === '全部委员会' ? null : selectedOrg.value,
     sponsorPersonName: selectedmember.value === '全部议员' ? null : selectedmember.value,
     status: selectedStatus.value === '通过' ? 1 : 0,
-    isInvolveCn: isInvolveCn ? 'Y' : 'N',
+    isInvolveCn: isInvolveCn.value ? 'Y' : 'N',
     sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
   }
   try {
@@ -1116,14 +1120,21 @@ const handleExport = () => {
 onMounted(async () => {
   handleGetOrgList()
   handleGetMemberList()
-
   initParam()
-
-
   // 初始化
   await fetchTableData()
+})
 
-
+onBeforeUnmount(() => {
+  if (timer1.value) {
+    clearTimeout(timer1.value)
+  }
+  if (timer2.value) {
+    clearTimeout(timer2.value)
+  }
+  if (timer3.value) {
+    clearTimeout(timer3.value)
+  }
 })
 
 </script>
@@ -1239,10 +1250,11 @@ onMounted(async () => {
 
   .data-main-box {
     width: 1568px;
-    height: 810px;
+    min-height: 810px;
     border-radius: 10px;
     background: var(--bg-white-100);
     margin: 0 auto;
+    margin-bottom: 20px;
     overflow: hidden;
 
     .data-main-box-header {
@@ -1274,8 +1286,7 @@ onMounted(async () => {
 
     .data-main-box-main {
       width: 1520px;
-      // height: 633px;
-      height: 680px;
+      min-height: 680px;
       border-radius: 10px;
       border: 1px solid var(--bg-black-5);
       margin: 0 auto;

src/views/dataLibrary/components/ChartContainer/index.vue

@@ -17,7 +17,7 @@
         <slot name="chart-box"></slot>
       </div>
       <div class="tip-box">
-        <TipTab />
+        <TipTab text="数据来源：美国国会官网" />
       </div>
     </div>
   </div>
@@ -176,8 +176,7 @@ const chartItemList = computed(() => {
     .tip-box {
       height: 54px;
       box-sizing: border-box;
-      padding-top: 10px;
-      // background: orange;
+      padding: 15px 600px;
     }
   }
 }

src/views/dataLibrary/components/SelectBox/index.vue

@@ -2,7 +2,7 @@
   <div class="select-wrapper" :class="{ 'select-wrapper-custom': selectValue === '自定义' }">
     <div class="select-left text-tip-1">{{ selectTitle + ':' }}</div>
     <div class="select-right" :class="{ 'select-right-custom': selectValue === '自定义' }">
-      <el-select v-model="selectValue" :placeholder="placeholderName" style="width: 240px">
+      <el-select v-model="selectValue" :placeholder="placeholderName" filterable style="width: 240px">
         <!-- <el-option label="全部领域" value="全部领域" /> -->
         <el-option v-for="item in selectList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>

src/views/dataLibrary/decree/index.vue

@@ -128,7 +128,7 @@
           <el-table ref="tableRef" :data="tableData" row-key="id" @selection-change="handleSelectionChange"
             @select="handleSelect" @select-all="handleSelectAll" style="width: 100%" :row-style="{ height: '52px' }">
             <el-table-column type="selection" width="40" />
-            <el-table-column label="法案名称" width="455">
+            <el-table-column label="政令名称" width="720">
               <template #default="scope">
                 <span class="title-item text-compact-bold" @click="handleClickToDetail(scope.row)">{{ scope.row.title
                 }}</span>
@@ -137,15 +137,23 @@
             <el-table-column label="发布时间" width="120" class-name="date-column">
               <template #default="scope">{{ scope.row.date }}</template>
             </el-table-column>
-            <el-table-column label="提案人" width="480">
+            <el-table-column label="发布机构" width="180">
               <template #default="scope">
-                <span class="person-item text-compact" @click="handlePerClick(scope.row)">{{ scope.row.sponsorPersonName
+                <span class="person-item text-compact" @click="handlePerClick(scope.row)">{{ scope.row.organizationName
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column property="affiliation" label="所属党派" width="120" />
-            <el-table-column property="originDepart" label="提出委员会" width="180" />
-            <el-table-column property="status" label="所处阶段" width="120" />
+            <el-table-column label="涉及领域" width="350" class-name="date-column">
+              <template #default="scope">
+                <div class="tag-box">
+                  <AreaTag v-for="tag, index in scope.row.domains" :key="index" :tagName="tag" />
+                </div>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="政令类型" width="100">
+              <template #default="scope">{{ scope.row.typeStr }}</template>
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -175,6 +183,8 @@ import { search } from '@/api/comprehensiveSearch'
 import { ElMessage } from 'element-plus'
 import getDateRange from '@/utils/getDateRange'
 
+import { getDepartmentList } from "@/api/decree/home";
+
 const route = useRoute();
 
 // 图表/数据
@@ -363,7 +373,7 @@ const activeTagList = computed(() => {
   }
 
   if (isInvolveTechnology.value) {
-    const involveStr = '政令相关'
+    const involveStr = '科技相关'
     arr.push(
       {
         tag: '科技相关',
@@ -593,18 +603,6 @@ const insList = ref([
     name: '全部机构',
     id: '全部机构'
   },
-  {
-    name: '机构1',
-    id: '机构1'
-  },
-  {
-    name: '机构2',
-    id: '机构2'
-  },
-  {
-    name: '其他',
-    id: '其他'
-  },
 ])
 const selectedIns = ref('全部机构')
 const insPlaceHolder = ref('请选择发布机构')
@@ -612,6 +610,30 @@ const handleSelectIns = value => {
   selectedIns.value = value
 }
 
+const handleGetDeparmentList = async () => {
+  try {
+    // let { keyWord, pageNum, pageSize, day } = organizationInfo
+    const params = {
+      day: 365,
+
+    }
+    const res = await getDepartmentList(params);
+    console.log("机构列表", res);
+    if (res.code === 200) {
+      let arr = res.data.orgList.map(item => {
+        return {
+          name: item.orgName,
+          id: item.orgName
+        }
+      })
+      insList.value = [...insList.value, ...arr]
+    }
+  } catch (error) {
+
+  }
+
+}
+
 // 政令类型列表
 const decreeTypeList = ref([
   {
@@ -642,6 +664,7 @@ const isInvolveTechnology = ref(false)
 const handleClear = () => {
   selectedArea.value = '全部领域'
   selectedDate.value = ''
+  customTime.value = []
   selectedIns.value = '全部机构'
   selectedDecreeType.value = '全部类型'
   isInvolveCn.value = false
@@ -701,12 +724,12 @@ const fetchTableData = async () => {
     keyword: '',
     type: 2,  // type 1= 法案  2= 政令 3 =智库 4=智库报告 5=实体清单【制裁记录】 6= 人物 7= 机构 8=新闻 9= 社媒
     domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],
-    proposedDateStart: customTime.value[0],
-    proposedDateEnd: customTime.value[1],
-    affiliation: selectedIns.value === '全部机构' ? null : selectedIns.value,
-    originChamber: selectedDecreeType.value === '全部类型' ? null : selectedDecreeType.value,
-    sleStatus: isInvolveCn ? 'Y' : 'N',
-    aaaa: isInvolveTechnology? 'Y' : 'N',
+    proposedDateStart: customTime.value[0]?customTime.value[0]:null,
+    proposedDateEnd: customTime.value[1]?customTime.value[1]:null,
+    organizationName: selectedIns.value === '全部机构' ? null : selectedIns.value,
+    decreeType: selectedDecreeType.value === '全部类型' ? null : selectedDecreeType.value,
+    isInvolveCn: isInvolveCn.value ? 'Y' : 'N',
+    isTechRelated: isInvolveTechnology.value ? 'Y' : 'N',
     sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
   }
   try {
@@ -731,7 +754,7 @@ const fetchTableData = async () => {
         name: key,
         value: Number(value)
       }))
-      staticsDemensionList.value[2].data = Object.entries(res.data.aggregationsOriginChamber).map(([key, value]) => ({
+      staticsDemensionList.value[2].data = Object.entries(res.data.aggregationsorganizationName).map(([key, value]) => ({
         name: key,
         value: Number(value)
       }))
@@ -773,11 +796,11 @@ const fetchAllData = async () => {
     domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],
     proposedDateStart: customTime.value[0],
     proposedDateEnd: customTime.value[1],
-    affiliation: selectedIns.value === '全部机构' ? null : selectedIns.value,
-    originChamber: selectedDecreeType.value === '全部类型' ? null : selectedDecreeType.value,
-    sleStatus: isInvolveCn ? 'Y' : 'N',
-        aaaa: isInvolveTechnology? 'Y' : 'N',
-    sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
+    organizationName: selectedIns.value === '全部机构' ? null : selectedIns.value,
+    decreeType: selectedDecreeType.value === '全部类型' ? null : selectedDecreeType.value,
+    isInvolveCn: isInvolveCn.value ? 'Y' : 'N',
+    isTechRelated: isInvolveTechnology.value ? 'Y' : 'N',
+    sort: isSort.value ? 0 : 1
   }
   try {
     const res = await search(params)
@@ -933,6 +956,9 @@ const initParam = () => {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(route.query.selectedDate)
     }
+
+    selectedIns.value = route.query.orgnizationName? route.query.orgnizationName : '全部机构'
+
     isInvolveCn.value = route.query.isInvolveCn ? true : false
 
     isInvolveTechnology.value = route.query.isInvolveTechnology ? true : false
@@ -946,7 +972,7 @@ const initParam = () => {
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('decreeRouteQuery') || '{}');
     selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
-    if (Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
+    if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)
     }
@@ -959,16 +985,16 @@ const initParam = () => {
 
 }
 
-// 跳转法案详情
-const handleClickToDetail = (curBill) => {
-  console.log('curBill', curBill);
+// 跳转政令详情
+const handleClickToDetail = (curDecree) => {
+  console.log('curDecree', curDecree);
 
-  window.sessionStorage.setItem("billId", curBill.id);
-  window.sessionStorage.setItem("curTabName", curBill.title);
+  window.sessionStorage.setItem("billId", curDecree.id);
+  window.sessionStorage.setItem("curTabName", curDecree.title);
   const route = router.resolve({
-    path: "/billLayout",
+    path: "/decreeLayout",
     query: {
-      billId: curBill.id
+      billId: curDecree.id
     }
   });
   window.open(route.href, "_blank");
@@ -989,13 +1015,16 @@ const handlePerClick = item => {
 
 // 导出
 const handleExport = () => {
+  if(!selectedCount.value) {
+    ElMessage.warning('请选择至少一项数据！')
+    return
+  }
   console.log(selectedMap.value);
   const arr = Array.from(selectedMap.value);
 
   const jsonStr = JSON.stringify(arr, null, 2);
   const blob = new Blob([jsonStr], { type: 'application/json' });
   const url = URL.createObjectURL(blob);
-
   const link = document.createElement('a');
   link.href = url;
   link.download = 'export.json';
@@ -1005,7 +1034,7 @@ const handleExport = () => {
 };
 
 onMounted(async () => {
-
+  handleGetDeparmentList()
   initParam()
 
   // 初始化
@@ -1127,10 +1156,11 @@ onMounted(async () => {
 
   .data-main-box {
     width: 1568px;
-    height: 810px;
+    min-height: 810px;
     border-radius: 10px;
     background: var(--bg-white-100);
     margin: 0 auto;
+    margin-bottom: 20px;
     overflow: hidden;
 
     .data-main-box-header {
@@ -1163,7 +1193,7 @@ onMounted(async () => {
     .data-main-box-main {
       width: 1520px;
       // height: 633px;
-      height: 680px;
+      min-height: 680px;
       border-radius: 10px;
       border: 1px solid var(--bg-black-5);
       margin: 0 auto;
@@ -1257,6 +1287,14 @@ onMounted(async () => {
 
 .date-column {
   background-color: #ecf5ff;
+
+  .tag-box {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    width: 340px;
+
+  }
 }
 
 .date-column .cell {
@@ -1284,6 +1322,8 @@ onMounted(async () => {
   }
 }
 
+
+
 :deep(.el-table__header-wrapper) {
   // background-color: #f5f7fa;
   height: 48px;

src/views/dataLibrary/index.vue

@@ -72,7 +72,7 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 import Icon1 from './assets/icons/sider-icon1.svg'
 import Icon2 from './assets/icons/sider-icon2.svg'
 import Icon3 from './assets/icons/sider-icon3.svg'
@@ -398,6 +398,8 @@ const handleClickTab = (tab) => {
   })
 }
 
+const timer = ref(null)
+
 // 关闭当前标签页
 const handleCloseCurTab = (tab, index) => {
 
@@ -416,7 +418,7 @@ const handleCloseCurTab = (tab, index) => {
     })
     if (index === openedTabList.value.length - 1) {
       tagsViewStore.delView(tab)
-      setTimeout(() => {
+      timer.value = setTimeout(() => {
         tagsViewStore.visitedViews[tagsViewStore.visitedViews.length - 1].active = true
         activeTab = tagsViewStore.visitedViews[tagsViewStore.visitedViews.length - 1]
         router.push({
@@ -593,6 +595,11 @@ onMounted(() => {
 
 })
 
+onBeforeUnmount(() => {
+  if(timer.value) {
+    clearTimeout(timer.value)
+  }
+})
 
 </script>
 

src/views/decree/decreeHome/index.vue

@@ -814,7 +814,25 @@ const handleBox5 = async () => {
 	let chart1 = getBarChart(chart1Data.value.dataX, chart1Data.value.dataY);
 	chart1.yAxis.name = "数量";
 	chart1.yAxis.nameTextStyle = { align: 'right' }
-	setChart(chart1, "chart1");
+		let org = '全部机构'
+	if(box5Params.proposeName) {
+		org = keyOrganizationList.value.filter(item => {
+			return item.orgId === box5Params.proposeName
+		})[0].orgName
+	}
+	let domain = '全部领域'
+	if(box5Params.domainId) {
+		domain = areaList.value.filter(item => {
+			return item.id === box5Params.domainId
+		})[0].name
+	}
+	const selectParam = {
+		moduleType: '政令',
+		orgnizationName: org,
+		domains: domain,
+		selectDate: box5Params.year
+	}
+	setChart(chart1, "chart1", true, selectParam);
 };
 
 // 政令科技领域
@@ -861,8 +879,19 @@ const handleGetDecreeArea = async () => {
 };
 const handleBox6 = async () => {
 	await handleGetDecreeArea();
+	let org = '全部机构'
+	if(box6Params.proposeName) {
+		org = keyOrganizationList.value.filter(item => {
+			return item.orgId === box6Params.proposeName
+		})[0].orgName
+	}
+	const selectParam = {
+		moduleType: '政令',
+		orgnizationName: org,
+		selectedDate: JSON.stringify([box6Params.year+'-01-01', box6Params.year+'-12-31'])
+	}
 	let chart2 = getPieChart(chart2Data.value);
-	setChart(chart2, "chart2");
+	setChart(chart2, "chart2", true, selectParam);
 };
 
 const handleBox6YearChange = () => {

src/views/home/index.vue

@@ -7,7 +7,7 @@
 					<router-view />
 				</div>
 			</div>
-			<div class="right-btn" @click="handleClickToolBox">
+			<div class="right-btn" v-if="isShowToolBox" @click="handleClickToolBox">
 				<div class="item">
 					<div class="icon">
 						<img src="@/assets/icons/overview/domain.png" alt="" />
@@ -22,20 +22,7 @@
 				</div>
 			</div>
 
-			<div class="tool-box">
-				<!-- <div class="tool-item">
-					<img src="@/assets/icons/tool-item-icon1.png" alt="" />
-				</div>
-				<div class="tool-item">
-					<img src="@/assets/icons/tool-item-icon2.png" alt="" />
-				</div>
-				<div class="tool-item">
-					<img src="@/assets/icons/tool-item-icon3.png" alt="" />
-				</div>
-				<div class="tool-item">
-					<img src="@/assets/icons/tool-item-icon4.png" alt="" />
-				</div> -->
-
+			<div class="tool-box" v-if="isShowToolBox">
 				<el-tooltip content="智能写报" placement="left" :offset="10">
 					<div class="tool-item" @click="handleOpenPage('znxb')">
 						<img src="@/assets/icons/tool-item-icon1.png" alt="" />
@@ -96,11 +83,13 @@ import { ElMessage } from "element-plus";
 const router = useRouter();
 const route = useRoute();
 
-const isShowHeader = computed(() => {
-	const isShow = route.meta.isShowHeader
-	return isShow? true : false
+const isShowToolBox = computed(() => {
+	const isDataLibrary = route.fullPath.includes("dataLibrary");
+	const isWrittingAsstaint = route.path === "/writtingAsstaint";
+	return !isDataLibrary && !isWrittingAsstaint;
 })
 
+const isShowHeader = computed(() => !!route.meta.isShowHeader);
 
 const isShowAiBox = ref(false);
 
@@ -816,4 +805,7 @@ body {
 	cursor: not-allowed;
 	pointer-events: none;
 }
+
+
+ 
 </style>