撤销 "合并分支 'fk-dev' 到 'pre'"

src/components/base/messageBubble/index.vue

@@ -10,7 +10,7 @@
 			</div>
 			<!-- <div class="more" @click="handleToMoreNews">{{ "更多 +" }}</div> -->
 		</div>
-		<div class="msg-bubble-main" ref="scrollContainer" @mouseenter="stopScroll" @mouseleave="startScroll">
+		<div class="msg-bubble-main" ref="scrollContainer">
 			<div class="message-bubble" v-for="(item, index) in displayList" :key="index" @click="handleClickPerson(item)">
 				<div class="avatar-container">
 					<img :src="item[props.imageUrl] || avatarUser" :alt="item[props.name]" class="avatar" />
@@ -110,9 +110,9 @@ const currentIndex = ref(0)
 
 // 计算当前显示的消息列表（只显示固定数量的消息）
 const displayList = computed(() => {
-	// if(props.messageList.length < 4) {
-	// 	return props.messageList
-	// }
+	if(props.messageList.length < 4) {
+		return props.messageList
+	}
 	// 确保 messageList 存在且有数据
 	if (!props.messageList || !Array.isArray(props.messageList) || props.messageList.length === 0) {
 		return []
@@ -140,7 +140,7 @@ const startScroll = () => {
 	if (timer) clearInterval(timer)
 	timer = setInterval(() => {
 		currentIndex.value = (currentIndex.value + 1) % props.messageList.length
-	}, 2400) // 每2.4秒滚动一条
+	}, 2000) // 每秒滚动一条
 }
 
 // 停止滚动
@@ -152,10 +152,9 @@ const stopScroll = () => {
 }
 
 onMounted(() => {
+	if (props.messageList.length > 3) {
 		startScroll()
-	// if (props.messageList.length > 3) {
-	// 	startScroll()
-	// }
+	}
 
 })
 
@@ -224,13 +223,12 @@ onBeforeUnmount(() => {
 	}
 
 	.msg-bubble-main {
-		height: 395px;
+		height: 402px;
 		overflow: hidden;
 		box-sizing: border-box;
 		padding-bottom: 8px;
 		padding-left: 21px;
 		padding-top: 23px;
-		// background: orange;
 
 		.message-bubble {
 			display: flex;

src/styles/components/GraphChart/index.vue

@@ -11,7 +11,7 @@
 `}}
 </pre>
       <div class="chart-box">
-        <GraphChart :nodes="nodes" :links="links" layoutType="none">
+        <GraphChart :nodes="nodes" :links="links" layoutType="force">
         </GraphChart>
       </div>
     </el-col>

src/utils/setChart.js

@@ -66,7 +66,7 @@ const setChart = (option, chartId, allowClick, selectParam) => {
               if (params.seriesName === '通过法案') {
                 selectParam.selectedStatus = 1
               } else {
-                selectParam.selectedStatus = 0
+                selectParam.selectedStatus = null
               }
 
               const route = router.resolve({

src/views/bill/billHome/index.vue

@@ -273,7 +273,7 @@ import {
 import { getPersonSummaryInfo } from "@/api/common/index";
 import { getChartAnalysis } from "@/api/aiAnalysis/index";
 import DivideHeader from "@/components/DivideHeader.vue";
-import overviewMainBox from "@/components/base/BoxBackground/OverviewMainBox.vue";
+import overviewMainBox from "@/components/base/boxBackground/overviewMainBox.vue";
 import OverviewCard from "./OverviewCard.vue";
 import ResourceLibrarySection from "./ResourceLibrarySection.vue";
 import { useContainerScroll } from "@/hooks/useScrollShow";
@@ -860,8 +860,7 @@ const handleBox5 = async () => {
 		})[0]?.name
 		const selectParam = {
 			moduleType: '国会法案',
-			domains: domain,
-			isInvolveCn: true
+			domains: domain
 		}
 		setChart(box5Chart, "box5Chart", true, selectParam);
 	}
@@ -913,7 +912,6 @@ const handleBox7Data = async () => {
 				moduleType: '国会法案',
 				key: '议院委员会',
 				selectedDate: box7selectetedTime.value,
-				isInvolveCn: true
 			}
 
 			const box7Chart = getDoublePieChart(data1, data2);
@@ -1043,7 +1041,7 @@ const handleBox9Data = async () => {
 			key: '领域',
 			selectedDate: box9selectetedTime.value,
 			selectedStatus: box9LegislativeStatus.value === '提出法案' ? 0 : 1,
-			isInvolveCn: true
+			isInvolveCn: 1
 		}
 		box9ChartInstance = setChart(box9Chart, "box9Chart", true, selectParam);
 	}
@@ -1225,7 +1223,7 @@ const handleBox8Data = async () => {
 				moduleType: '国会法案',
 				key: '所处阶段',
 				selectedDate: box8selectetedTime.value,
-				isInvolveCn: true
+				isInvolveCn: 1
 			}
 
 			await nextTick();

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

@@ -8,7 +8,7 @@
         </div>
       </div>
       <div class="header-center text-title-3-bold">{{ chartTitle }}</div>
-      <div class="header-right" @click="handleDownload">
+      <div class="header-right">
         <img src="./assets/icons/download.svg" alt="">
       </div>
     </div>
@@ -17,7 +17,7 @@
         <slot name="chart-box"></slot>
       </div>
       <div class="tip-box">
-        <TipTab text="数据来源：美国各政府机构官网" data-time="" />
+        <TipTab />
       </div>
     </div>
   </div>
@@ -63,7 +63,7 @@ const defaultChartTypeList = [
 ]
 
 
-const emit = defineEmits('clickChartItem', 'download')
+const emit = defineEmits('clickChartItem')
 
 const handleClickChartItem = (item) => {
   chartItemList.value.forEach(chart => {
@@ -104,10 +104,6 @@ const chartItemList = computed(() => {
   return arr
 })
 
-const handleDownload = () => {
-  emit('download')
-}
-
 </script>
 
 <style lang="scss" scoped>
@@ -180,8 +176,6 @@ const handleDownload = () => {
     .tip-box {
       height: 54px;
       box-sizing: border-box;
-
-      padding: 0 500px;
       padding-top: 10px;
       // background: orange;
     }

src/views/dataLibrary/decree/index.vue

@@ -125,23 +125,24 @@
           <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="455">
               <template #default="scope">
                 <span class="title-item text-compact-bold" @click="handleClickToDetail(scope.row)">{{ scope.row.title
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发布时间" width="180" class-name="date-column">
+            <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="480">
               <template #default="scope">
                 <span class="person-item text-compact" @click="handlePerClick(scope.row)">{{ scope.row.sponsorPersonName
                 }}</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="affiliation" label="所属党派" width="120" />
+            <el-table-column property="originDepart" label="提出委员会" width="180" />
+            <el-table-column property="status" label="所处阶段" width="120" />
           </el-table>
         </div>
       </div>