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

src/App.vue

@@ -29,6 +29,25 @@ import { ElMessage } from "element-plus";
 const router = useRouter();
 const route = useRoute();
 
+import useTagsViewStore from '@/stores/tagsView.js'
+
+const tagsViewStore = useTagsViewStore()
+
+
+// 在路由全局守卫中处理
+router.beforeEach((to, from, next) => {
+  // 路由允许添加标签（排除掉隐藏的布局页如 /404, /login 等）
+  if (to.path.includes('dataLibrary')) {
+    tagsViewStore.addView({
+      path: to.path,
+      name: to.name, // 对应组件的 name，用于缓存
+      meta: { ...to.meta },
+      active: true
+    })
+  }
+  next()
+})
+
 
 const isShowAiBox = ref(false);
 

src/components/base/WarningPane/index.vue

 <template>
-  <div class="warnning-pane-wrapper" :style="{ width: width ? width : '1600px', height: height ? height : 'auto', minHeight: height ? undefined : '116px' }"
+  <div class="warnning-pane-wrapper" :style="{ width: width ? width : '1600px' }"
     :class="{
       level1: warnningLevel === '特别重大风险',
       level2: warnningLevel === '重大风险',
@@ -27,12 +27,22 @@
       </div>
     </div>
     <div class="warnning-pane-content text-regular">
-      {{ warnningContent }}
+      {{ showContent }}
+      <div class="show-all-btn" v-if="props.warnningContent.length > 185" @click.stop="handleClickShowAll">
+        <div class="text text-tip-2">
+          {{ isShowAllContent? '收起' : '展开' }}
+        </div>
+        <div class="icon">
+          <img v-if="!isShowAllContent" src="./icons/down.png" alt="">
+          <img v-else src="./icons/up.png" alt="">
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script setup>
+import {ref, computed} from 'vue'
 import { ElMessage } from 'element-plus'
 
 
@@ -50,6 +60,14 @@ const props = defineProps(
   }
 )
 
+const showContent = computed(() => {
+  if(!isShowAllContent.value) {
+    return props.warnningContent.length > 185 ? props.warnningContent.slice(0,185) + '...' : props.warnningContent
+  } else {
+    return props.warnningContent
+  }
+})
+
 const emit = defineEmits(['clickPane'])
 
 const handleClickPane = () => {
@@ -57,6 +75,12 @@ const handleClickPane = () => {
   emit('clickPane')
 }
 
+const isShowAllContent = ref(false)
+
+const handleClickShowAll = () => {
+  isShowAllContent.value = !isShowAllContent.value
+}
+
 </script>
 
 <style lang="scss" scoped>
@@ -64,7 +88,8 @@ const handleClickPane = () => {
   border-radius: 10px;
   border: 1px solid var(--color-primary-100);
   box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
-  cursor: pointer;
+  // cursor: pointer;
+  height: max-content;
 }
 
 .level1 {
@@ -146,12 +171,40 @@ const handleClickPane = () => {
 .warnning-pane-content{
   width: calc(100% - 40px);
   margin: 0 auto;
-  margin-bottom: 16px;
-  min-height: 60px;
-  height: auto;
-  display: block;
-  overflow: visible;
-  white-space: pre-wrap;
-  word-break: break-word;
+  // height: 60px;
+  // display: -webkit-box;
+  // /* 2. 设置内部布局方向为垂直 */
+  // -webkit-box-orient: vertical;
+  // /* 3. 限制显示的行数为 2 行 */
+  // -webkit-line-clamp: 2;
+  // /* 4. 隐藏超出部分 */
+  // overflow: hidden;
+  // /* 5. 设置文本溢出显示省略号 */
+  // text-overflow: ellipsis;
+  position: relative;
+  .show-all-btn {
+    position: absolute;
+    right: 0px;
+    bottom: 4px;
+    width: 48px;
+    height: 22px;
+    display: flex;
+    gap: 4px;
+    cursor: pointer;
+    .text{
+      color: var(--text-primary-50-color);
+      &:hover{
+        color: var(--color-primary-100);
+      }
+    }
+    .icon{
+      width: 16px;
+      height: 16px;
+      img{
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
 }
 </style>
\ No newline at end of file

src/main.js

@@ -20,7 +20,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 // import AnalysisBox from '@/components/base/BoxBackground/AnalysisBox.vue'
 // import NewsList from '@/components/base/NewsList/index.vue'
 // import ModuleHeader from '@/components/base/ModuleHeader/index.vue'
-// import RiskSignal from "@/components/base/RiskSignal/index.vue";
+// import RiskSignal from "@/components/base/riskSignal/index.vue";
 // import MessageBubble from "@/components/base/MessageBubble/index.vue";
 // import SourceTabLsit from '@/components/base/SourceTabList/index.vue'
 // import ActionButton from "@/components/base/ActionButton/index.vue"

src/router/index.js

@@ -65,4 +65,5 @@ router.beforeEach((to, from, next) => {
   next();
 });
 
+
 export default router;

src/utils/setChart.js

@@ -11,7 +11,6 @@ const setChart = (option, chartId, allowClick, selectParam) => {
   let chart = echarts.init(chartDom);
   chart.setOption(option);
   if (allowClick) {
-    // 3. 添加点击事件监听
     chart.on('click', function (params) {
       switch (selectParam.moduleType) {
         case '国会法案':

src/views/bill/billHome/index.vue

@@ -992,7 +992,9 @@ const handleBox9Data = async () => {
 		const selectParam = {
 			moduleType: '国会法案',
 			proposedDateStart: box9selectetedTime.value,
-			status: box9LegislativeStatus.value === '提出法案' ? 0 : 1
+			status: box9LegislativeStatus.value === '提出法案' ? 0 : 1,
+			isInvolveCn: 1
+
 
 		}
 		box9ChartInstance = setChart(box9Chart, "box9Chart", true, selectParam);

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

@@ -114,7 +114,7 @@
 </template>
 
 <script setup>
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { ref, onMounted, computed } from "vue";
 import router from "@/router";
 import { getCoopRestrictionTrends, getCoopRestrictionSignals } from "@/api/coopRestriction/coopRestriction.js";

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

@@ -8,19 +8,29 @@
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
         <SelectBox v-if="isFolderAll" :placeholder-name="partyPlaceHolder" select-title="所属党派" :select-list="partyList"
-          :select-name="selectedParty" @update:select-text="handleSelectArea" />
-        <SelectBox v-if="isFolderAll" :placeholder-name="congressPlaceHolder" select-title="提出议院" :select-list="congressList"
-          :select-name="selectedCongress" @update:select-text="handleSelectArea" />
-        <SelectBox v-if="isFolderAll" :placeholder-name="areaPlaceHolder" select-title="委员会" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
-        <SelectBox v-if="isFolderAll" :placeholder-name="areaPlaceHolder" select-title="提出议员" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
-        <SelectBox v-if="isFolderAll" :placeholder-name="statusPlaceHolder" select-title="所处阶段" :select-list="statusList"
-          :select-name="selectedStauts" @update:select-text="handleSelectArea" />
+          :select-name="selectedParty" @update:select-text="handleSelectParty" />
+        <SelectBox v-if="isFolderAll" :placeholder-name="congressPlaceHolder" select-title="提出议院"
+          :select-list="congressList" :select-name="selectedCongress" @update:select-text="handleSelectCongress" />
+        <SelectBox v-if="isFolderAll" :placeholder-name="orgPlaceHolder" select-title="委员会" :select-list="orgList"
+          :select-name="selectedOrg" @update:select-text="handleSelectOrg" />
+        <SelectBox v-if="isFolderAll" :placeholder-name="memberPlaceHolder" select-title="提出议员"
+          :select-list="memberList" :select-name="selectedmember" @update:select-text="handleSelectMember" />
+        <SelectBox v-if="isFolderAll" :placeholder-name="statusPlaceHolder" select-title="所处阶段"
+          :select-list="statusList" :select-name="selectedStauts" @update:select-text="handleSelectStauts" />
+        <div class="check-box">
+          <div class="check-box-left text-tip-1">
+            {{ '是否涉华：' }}
+          </div>
+          <div class="check-box-right">
+            <el-checkbox v-model="isInvolveCn" class="involve-checkbox" @change="handleInvolveCnChange">
+              {{ '只看涉华委员会' }}
+            </el-checkbox>
+          </div>
+        </div>
       </div>
       <div class="header-footer">
         <div class="header-footer-left">
-          <ActiveTag v-for="tag, index in activeTagList" :key="index" :tagName="tag.name"
+          <ActiveTag v-for="tag, index in activeTagList" :key="index" :tagName="tag"
             @close="handleCloseCurTag(tag, index)" />
         </div>
         <div class="header-footer-right">
@@ -53,10 +63,10 @@
           <ChartContainer chartTitle="美国会法案提出数量随时间变化趋势" :chartTypeList="curChartTypeList"
             @clickChartItem="handleSwitchActiveChart">
             <template #chart-box>
-              <LineChart v-if="activeChart === '折线图'" :lineChartData="lineChartData" />
-              <PieChart v-if="activeChart === '饼状图'" :pieChartData="pieChartData" />
-              <BarChart v-if="activeChart === '柱状图'" :barChartData="barChartData" />
-              <RaderChart v-if="activeChart === '雷达图'" :radarChartData="radarChartData" />
+              <LineChart v-if="activeChart === '折线图'" :lineChartData="curChartData" />
+              <PieChart v-if="activeChart === '饼状图'" :pieChartData="curChartData" />
+              <BarChart v-if="activeChart === '柱状图'" :barChartData="curChartData" />
+              <RaderChart v-if="activeChart === '雷达图'" :radarChartData="curChartData" />
             </template>
           </ChartContainer>
 
@@ -109,13 +119,23 @@
         <div class="data-main-box-main-content">
           <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="55" />
-            <el-table-column label="Date" width="180" class-name="date-column">
+            <el-table-column type="selection" width="40" />
+            <el-table-column label="法案名称" width="455">
+              <template #default="scope">
+                <span class="title-item text-compact-bold">{{ scope.row.title }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="日期" width="120" class-name="date-column">
               <template #default="scope">{{ scope.row.date }}</template>
             </el-table-column>
-            <el-table-column property="name" label="Name" width="180" />
-            <el-table-column property="address" label="use show-overflow-tooltip" width="360" show-overflow-tooltip />
-            <el-table-column property="address" label="address" />
+            <el-table-column label="提出人" width="480">
+              <template #default="scope">
+                <span class="person-item text-compact">{{ 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="status" label="所处阶段" width="120" />
           </el-table>
         </div>
       </div>
@@ -139,9 +159,13 @@ import BarChart from '../../components/BarChart/index.vue'
 import RaderChart from '../../components/RadarChart/idnex.vue'
 import SelectBox from '../../components/SelectBox/index.vue'
 import { useRoute } from "vue-router";
+
+import { getPostOrgList, getPostMemberList } from '@/api/bill/billHome'
+import { search } from '@/api/comprehensiveSearch'
+
 const route = useRoute();
 // 图表/数据
-const isShowChart = ref(true)
+const isShowChart = ref(false)
 
 const handleSwitchChartData = () => {
   isShowChart.value = !isShowChart.value
@@ -155,32 +179,41 @@ const staticsDemensionList = ref([
   {
     name: '提案时间',
     active: true,
-    chartTypeList: ['折线图', '柱状图']
+    chartTypeList: ['折线图', '柱状图'],
+    data: {
+      dataX: [],
+      dataY: []
+    }
   },
   {
     name: '科技领域',
     active: false,
-    chartTypeList: ['饼状图']
+    chartTypeList: ['饼状图'],
+    data: []
   },
   {
     name: '提出议院',
     active: false,
-    chartTypeList: ['饼状图', '雷达图']
+    chartTypeList: ['饼状图'],
+    data: []
   },
   {
     name: '提出委员会',
     active: false,
-    chartTypeList: ['折线图', '柱状图', '饼状图']
+    chartTypeList: ['饼状图'],
+    data: []
   },
   {
     name: '提出议员党派',
     active: false,
-    chartTypeList: ['饼状图']
+    chartTypeList: ['饼状图'],
+    data: []
   },
   {
     name: '立法阶段',
     active: false,
-    chartTypeList: ['饼状图']
+    chartTypeList: ['饼状图'],
+    data: []
   },
 ])
 
@@ -193,12 +226,16 @@ const curChartTypeList = computed(() => {
 const curDemension = ref('提案时间')
 
 const handleClickDemensionItem = (val) => {
+  activeChart.value = ''
   staticsDemensionList.value.forEach(item => {
     item.active = false
   })
   val.active = true
   curDemension.value = val.name
-  activeChart.value = val.chartTypeList[0]
+  setTimeout(() => {
+    activeChart.value = val.chartTypeList[0]
+    curChartData.value = val.data
+  })
 }
 
 const selectedTime = ref('按月统计')
@@ -218,25 +255,44 @@ const timeList = ref([
 ])
 
 // 激活的标签列表
-const activeTagList = ref([
-  {
-    name: '人工智能'
-  },
-  {
-    name: '共和党'
-  },
-  {
-    name: '2025-01-01 至 2025-12-31'
-  },
+const activeTagList = computed(() => {
+  const arr = []
+  if (selectedArea.value && selectedArea !== '全部领域') {
+    arr.push(selectedArea.value)
+  }
+  if (selectedDate.value) {
+    arr.push(selectedDate.value)
+  }
+  if (selectedParty.value && selectedParty !== '全部党派') {
+    arr.push(selectedParty.value)
+  }
+  if (selectedCongress.value && selectedCongress !== '全部议院') {
+    arr.push(selectedCongress.value)
+  }
+  if (selectedOrg.value && selectedOrg !== '全部委员会') {
+    arr.push(selectedOrg.value)
+  }
+  if (selectedmember.value && selectedmember !== '全部议员') {
+    arr.push(selectedmember.value)
+  }
+  if (selectedStauts.value && selectedStauts !== '全部阶段') {
+    arr.push(selectedStauts.value)
+  }
+  if (isInvolveCn.value) {
+    const involveStr = '涉华'
+    arr.push(involveStr)
+  }
 
-])
+  return arr
+
+})
 
 const handleCloseCurTag = (tag, index) => {
   // alert(tag.name)
   activeTagList.value.splice(index, 1)
 }
 
-const activeChart = ref('折线图')
+const activeChart = ref('')
 
 const handleSwitchActiveChart = val => {
   activeChart.value = val.name
@@ -373,18 +429,70 @@ const operationList = ref([
 const areaPlaceHolder = ref('请选择领域')
 const selectedArea = ref('')
 const areaList = ref([
+  {
+    name: '全部领域',
+    id: '全部领域'
+  },
   {
     name: '人工智能',
     id: '人工智能'
   },
+  {
+    name: '生物科技',
+    id: '生物科技'
+  },
+  {
+    name: '新一代通信网络',
+    id: '新一代通信网络'
+  },
+  {
+    name: '量子科技',
+    id: '量子科技'
+  },
+  {
+    name: '新能源',
+    id: '新能源'
+  },
   {
     name: '集成电路',
     id: '集成电路'
   },
+  {
+    name: '海洋',
+    id: '海洋'
+  },
   {
     name: '先进制造',
     id: '先进制造'
   },
+  {
+    name: '新材料',
+    id: '新材料'
+  },
+  {
+    name: '航空航天',
+    id: '航空航天'
+  },
+  {
+    name: '太空',
+    id: '太空'
+  },
+  {
+    name: '深海',
+    id: '深海'
+  },
+  {
+    name: '极地',
+    id: '极地'
+  },
+  {
+    name: '核',
+    id: '核'
+  },
+  {
+    name: '其他',
+    id: '其他'
+  },
 ])
 
 const handleSelectArea = (value) => {
@@ -450,6 +558,10 @@ const partyList = ref([
 const selectedParty = ref('')
 const partyPlaceHolder = ref('请选择党派')
 
+const handleSelectParty = value => {
+  selectedParty.value = value
+}
+
 // 议院列表
 const congressList = ref([
   {
@@ -465,6 +577,10 @@ const congressList = ref([
 const selectedCongress = ref('')
 const congressPlaceHolder = ref('请选择议院')
 
+const handleSelectCongress = value => {
+  selectedCongress.value = value
+}
+
 // 议院列表
 const statusList = ref([
   {
@@ -480,6 +596,79 @@ const statusList = ref([
 const selectedStauts = ref('')
 const statusPlaceHolder = ref('请选择立法阶段')
 
+const handleSelectStauts = value => {
+  selectedStauts.value = value
+}
+
+// 是否涉华
+const isInvolveCn = ref(true)
+const handleInvolveCnChange = () => {
+
+}
+
+// 委员会
+const orgList = ref([
+
+])
+
+const selectedOrg = ref('')
+const orgPlaceHolder = ref('请选择委员会')
+
+const handleSelectOrg = value => {
+  selectedOrg.value = value
+}
+
+// 获取委员会
+const handleGetOrgList = async () => {
+  try {
+    const res = await getPostOrgList()
+    console.log('委员会列表', res);
+    if (res.code === 200 && res.data) {
+      orgList.value = res.data.map(item => {
+        return {
+          name: item.departmentName,
+          id: item.departmentName
+        }
+      })
+    }
+
+  } catch (error) {
+    console.error('获取委员会列表报错:', error);
+
+  }
+}
+
+// 提出议员
+const memberList = ref([
+])
+
+const selectedmember = ref('')
+const memberPlaceHolder = ref('请选择议员')
+
+const handleSelectMember = value => {
+  selectedmember.value = value
+}
+
+// 获取议员
+const handleGetMemberList = async () => {
+  try {
+    const res = await getPostMemberList()
+    console.log('议员列表', res);
+    if (res.code === 200 && res.data) {
+      memberList.value = res.data.map(item => {
+        return {
+          name: item.memberName,
+          id: item.memberName
+        }
+      })
+    }
+
+  } catch (error) {
+    console.error('获取议员列表报错:', error);
+
+  }
+}
+
 // 展开全部 / 收起
 const isFolderAll = ref(false)
 const handleSwitchFolderAll = () => {
@@ -492,78 +681,6 @@ const tableRef = ref(null)
 
 // 表格数据
 const tableData = ref([
-  {
-    id: 1,
-    date: '2016-05-04',
-    name: 'Aleyna Kutzner',
-    address: 'Lohrbergstr. 86c, Süd Lilli, Saarland',
-  },
-  {
-    id: 2,
-    date: '2016-05-03',
-    name: 'Helen Jacobi',
-    address: '760 A Street, South Frankfield, Illinois',
-  },
-  {
-    id: 3,
-    date: '2016-05-02',
-    name: 'Brandon Deckert',
-    address: 'Arnold-Ohletz-Str. 41a, Alt Malinascheid, Thüringen',
-  },
-  {
-    id: 4,
-    date: '2016-05-01',
-    name: 'Margie Smith',
-    address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  },
-  {
-    id: 5,
-    date: '2016-05-01',
-    name: 'Margie Smith',
-    address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  },
-  {
-    id: 6,
-    date: '2016-05-01',
-    name: 'Margie Smith',
-    address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  },
-  {
-    id: 7,
-    date: '2016-05-01',
-    name: 'Margie Smith',
-    address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  },
-  {
-    id: 8,
-    date: '2016-05-01',
-    name: 'Margie Smith',
-    address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  },
-  {
-    id: 9,
-    date: '2016-05-01',
-    name: 'Margie Smith',
-    address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  },
-  {
-    id: 10,
-    date: '2016-05-01',
-    name: 'Margie Smith',
-    address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  },
-  // {
-  //   id: 11,
-  //   date: '2016-05-01',
-  //   name: 'Margie Smith',
-  //   address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  // },
-  // {
-  //   id: 12,
-  //   date: '2016-05-01',
-  //   name: 'Margie Smith',
-  //   address: '23618 Windsor Drive, West Ricardoview, Idaho',
-  // }
 ])
 
 
@@ -599,7 +716,59 @@ const selectedCount = computed(() => selectedMap.value.size)
 // 获取表格数据（示例）
 const fetchTableData = async () => {
   // 调用接口获取数据...
-  // const res = await getList({ page: currentPage.value, size: pageSize.value })
+  const params = {
+    page: currentPage.value,
+    size: pageSize.value,
+    keyword: '',
+    type: 1,  // type 1= 法案  2= 政令 3 =智库 4=智库报告 5=实体清单【制裁记录】 6= 人物 7= 机构 8=新闻 9= 社媒
+    domains: selectedArea.value ? [selectedArea.value] : null,
+    proposedDateStart: selectedDate.value ? selectedDate.value : null,
+    proposedDateEnd: null,
+    affiliation: selectedParty.value ? selectedParty.value : null,
+    originChamber: selectedCongress.value ? selectedCongress.value : null,
+    originDepart: selectedOrg.value ? selectedOrg.value : null,
+    sponsorPersonName: selectedmember.value ? selectedmember.value : null,
+    status: selectedStauts.value === '通过' ? 1 : 0,
+    sleStatus: isInvolveCn ? 1 : 0
+  }
+  try {
+    const res = await search(params)
+    console.log('搜索结果', res);
+    if (res.code === 200 && res.data) {
+      tableData.value = res.data.records
+      totalNum.value = res.data.total
+
+
+      staticsDemensionList.value[0].data = {
+        dataX: Object.keys(res.data.aggregationsDate),
+        dataY: Object.values(res.data.aggregationsDate).map(value => Number(value))
+      }
+      staticsDemensionList.value[1].data = Object.entries(res.data.aggregationsDomain).map(([key, value]) => ({
+        name: key,
+        value: Number(value)
+      }))
+      staticsDemensionList.value[2].data = Object.entries(res.data.aggregationsOriginChamber).map(([key, value]) => ({
+        name: key,
+        value: Number(value)
+      }))
+      staticsDemensionList.value[3].data = Object.entries(res.data.aggregationsOriginDepart).map(([key, value]) => ({
+        name: key,
+        value: Number(value)
+      }))
+      staticsDemensionList.value[4].data = Object.entries(res.data.aggregationsAffiliation).map(([key, value]) => ({
+        name: key,
+        value: Number(value)
+      }))
+      staticsDemensionList.value[5].data = Object.entries(res.data.aggregationsStatus).map(([key, value]) => ({
+        name: key === '1' ? '通过' : '提出',
+        value: Number(value)
+      }))
+    }
+
+
+  } catch (error) {
+
+  }
   // tableData.value = res.data
   // total.value = res.total
 
@@ -720,30 +889,23 @@ watch(tableData, () => {
   })
 })
 
-onMounted(() => {
-  selectedArea.value = route.query.domains?JSON.parse(route.query.domains)[0]:''
-  selectedDate.value = route.query.proposedDateStart
+// 当前图表数据
+const curChartData = ref(null)
 
-  activeTagList.value = [
-  ]
-  if (selectedArea.value) {
-    activeTagList.value.push(
-      { name: selectedArea.value }
-    )
-  }
-  if (selectedDate.value) {
-    activeTagList.value.push({
-      name: selectedDate.value
-    })
-  }
-  if (route.query.status === '0' || route.query.status === '1') {
-    activeTagList.value.push({
-      name: route.query.status === '0' ? '提出' : '通过'
-    })
-  }
+onMounted(async () => {
+  handleGetOrgList()
+  handleGetMemberList()
+  selectedArea.value = route.query.domains ? JSON.parse(route.query.domains)[0] : ''
+  selectedDate.value = route.query.proposedDateStart,
+    isInvolveCn.value = route.query.isInvolveCn ? true : false
+  selectedStauts.value = route.query.status === '1' ? '通过' : '提出'
 
   // 初始化
-  fetchTableData()
+  await fetchTableData()
+
+
+  activeChart.value = staticsDemensionList.value[0].chartTypeList[0]
+  curChartData.value = staticsDemensionList.value[0].data
 
 })
 
@@ -780,7 +942,20 @@ onMounted(() => {
       display: flex;
       flex-wrap: wrap;
       gap: 12px 42px;
+
       // transition: all ease 1s;
+      .check-box {
+        display: flex;
+        width: 348px;
+        height: 28px;
+        align-items: center;
+        gap: 8px;
+
+        .check-box-left {
+          width: 100px;
+          color: var(--text-primary-65-color);
+        }
+      }
     }
 
 
@@ -979,4 +1154,12 @@ onMounted(() => {
   color: #409eff !important;
   font-weight: 500;
 }
+
+.title-item {
+  color: var(--text-primary-80-color);
+}
+
+.person-item {
+  color: var(--color-primary-100);
+}
 </style>
\ No newline at end of file

src/views/dataLibrary/index.vue

@@ -111,13 +111,13 @@ const siderList = ref([
   {
     name: '科技法案',
     icon: Icon1,
-    active: true,
-    isExpanded: true,
+    active: false,
+    isExpanded: false,
     children: [
       {
         name: '国会法案',
         path: '/dataLibrary/countryBill',
-        active: true,
+        active: false,
       },
       {
         name: '州法案',
@@ -477,6 +477,118 @@ const handleClickToolBox = () => {
 };
 
 onMounted(() => {
+  const path = route.path
+  switch (path) {
+    case '/dataLibrary/countryBill':
+      siderList.value[0].active = true
+      siderList.value[0].isExpanded = true
+      siderList.value[0].children[0].active = true
+
+      break
+    case '/dataLibrary/stateBill':
+      siderList.value[0].active = true
+      siderList.value[0].isExpanded = true
+      siderList.value[0].children[1].active = true
+      break
+    case '/dataLibrary/dataDecree':
+      siderList.value[1].active = true
+      break
+    case '/dataLibrary/dataThinkTank':
+      siderList.value[2].active = true
+      break
+    case '/dataLibrary/dataEntityList':
+      siderList.value[3].active = true
+      siderList.value[3].isExpanded = true
+      siderList.value[3].children[0].active = true
+      break
+    case '/dataLibrary/dataCommerceControlList':
+      siderList.value[3].active = true
+      siderList.value[3].isExpanded = true
+      siderList.value[3].children[1].active = true
+      break
+    case '/dataLibrary/dataEntityListEvent':
+      siderList.value[3].active = true
+      siderList.value[3].isExpanded = true
+      siderList.value[3].children[2].active = true
+      break
+    case '/dataLibrary/dataCommerceControlListEvent':
+      siderList.value[3].active = true
+      siderList.value[3].isExpanded = true
+      siderList.value[3].children[3].active = true
+      break
+    case '/dataLibrary/sDNList':
+      siderList.value[4].active = true
+      siderList.value[4].isExpanded = true
+      siderList.value[4].children[0].active = true
+      break
+    case '/dataLibrary/mREList':
+      siderList.value[4].active = true
+      siderList.value[4].isExpanded = true
+      siderList.value[4].children[1].active = true
+      break
+    case '/dataLibrary/sDNListEvent':
+      siderList.value[4].active = true
+      siderList.value[4].isExpanded = true
+      siderList.value[4].children[2].active = true
+      break
+    case '/dataLibrary/mREListEvent':
+      siderList.value[4].active = true
+      siderList.value[4].isExpanded = true
+      siderList.value[4].children[3].active = true
+      break
+    case '/dataLibrary/case337':
+      siderList.value[5].active = true
+      siderList.value[5].isExpanded = true
+      siderList.value[5].children[0].active = true
+      break
+    case '/dataLibrary/case232':
+      siderList.value[5].active = true
+      siderList.value[5].isExpanded = true
+      siderList.value[5].children[1].active = true
+      break
+    case '/dataLibrary/case301':
+      siderList.value[5].active = true
+      siderList.value[5].isExpanded = true
+      siderList.value[5].children[2].active = true
+      break
+    case '/dataLibrary/congressMan':
+      siderList.value[6].active = true
+      siderList.value[6].isExpanded = true
+      siderList.value[6].children[0].active = true
+      break
+    case '/dataLibrary/technologyLeader':
+      siderList.value[6].active = true
+      siderList.value[6].isExpanded = true
+      siderList.value[6].children[1].active = true
+      break
+    case '/dataLibrary/minister':
+      siderList.value[6].active = true
+      siderList.value[6].isExpanded = true
+      siderList.value[6].children[2].active = true
+      break
+    case '/dataLibrary/thinkTankResearcher':
+      siderList.value[6].active = true
+      siderList.value[6].isExpanded = true
+      siderList.value[6].children[3].active = true
+      break
+    case '/dataLibrary/technologyCompany':
+      siderList.value[7].active = true
+      siderList.value[7].isExpanded = true
+      siderList.value[7].children[0].active = true
+      break
+    case '/dataLibrary/researchUniversity':
+      siderList.value[7].active = true
+      siderList.value[7].isExpanded = true
+      siderList.value[7].children[1].active = true
+      break
+    case '/dataLibrary/keyLab':
+      siderList.value[7].active = true
+      siderList.value[7].isExpanded = true
+      siderList.value[7].children[2].active = true
+      break
+  }
+
+
 
 })
 
@@ -683,7 +795,8 @@ onMounted(() => {
           .icon {
             width: 16px;
             height: 16px;
-            &:hover{
+
+            &:hover {
               border-radius: 8px;
               background: var(--color-primary-10);
             }

src/views/exportControl/index.vue

@@ -703,7 +703,7 @@
 <script setup>
 //这是一个备注
 import NewsList from "@/components/base/newsList/index.vue";
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { onMounted, ref, computed, reactive, shallowRef, watch, nextTick } from "vue";
 import { useContainerScroll } from "@/hooks/useScrollShow";
 const homeMainRef = ref(null);

src/views/finance/index.vue

@@ -459,7 +459,7 @@
 </template>
 
 <script setup>
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { onMounted, ref, computed } from "vue";
 import scrollToTop from "@/utils/scrollToTop";
 import setChart from "@/utils/setChart";

src/views/marketAccessRestrictions/marketAccessHome/index.vue

@@ -394,7 +394,7 @@ import { onMounted, ref, nextTick } from "vue";
 
 import LeftBtn from "@/components/base/PageBtn/LeftBtn.vue";
 import RightBtn from "@/components/base/PageBtn/RightBtn.vue";
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import TipTab from "@/components/base/TipTab/index.vue"
 import MessageBubble from "@/components/base/MessageBubble/index.vue"
 import NewsList from "@/components/base/NewsList/index.vue";

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

@@ -75,7 +75,7 @@
 </template>
 
 <script setup>
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { ref, onBeforeMount, computed } from "vue";
 import router from "@/router";
 import { getLatestUpdates, getRiskSignal } from '@/api/ruleRestriction/index.js'

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

@@ -89,7 +89,7 @@
 </template>
 
 <script setup>
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { ref, onMounted } from "vue";
 import {
 	getNewProject, getRiskSignal

src/views/technologyFigures/index.vue

@@ -317,7 +317,7 @@
 </template>
 
 <script setup>
-import RiskSignal from "@/components/base/RiskSignal/index.vue";
+import RiskSignal from "@/components/base/riskSignal/index.vue";
 import { onMounted, ref } from "vue";
 import { useRouter } from "vue-router";
 import scrollToTop from "@/utils/scrollToTop";