feat:更新数据资源库

src/utils/setChart.js

@@ -15,22 +15,29 @@ const setChart = (option, chartId, allowClick, selectParam) => {
     chart.on('click', function (params) {
       switch (selectParam.moduleType) {
         case '国会法案':
-          if(selectParam.selectedDate && selectParam.length === 4) {
-            selectParam.selectedDate = JSON.stringify([selectParam.selectedDate+'-01-01',selectParam.selectedDate+'-12-31'])
-          }
           // 判断点击的是否为饼图的数据项
           if (params.componentType === 'series' && params.seriesType === 'pie') {
             console.log('点击的扇形名称：', params.name);
             if (selectParam.key === '领域') {
               selectParam.domains = params.name
+              if (selectParam.selectedDate.length === 4) {
+                selectParam.selectedDate = JSON.stringify([selectParam.selectedDate + '-01-01', selectParam.selectedDate + '-12-31'])
+              }
             } else if (selectParam.key === '议院委员会') {
               if (params.name === '众议院' || params.name === '参议院') {
                 selectParam.selectedCongress = params.name
                 selectParam.selectedOrg = ''
+                if (selectParam.selectedDate.length === 4) {
+                  selectParam.selectedDate = JSON.stringify([selectParam.selectedDate + '-01-01', selectParam.selectedDate + '-12-31'])
+                }
               } else {
                 selectParam.selectedOrg = params.name
                 selectParam.selectedCongress = ''
+                if (selectParam.selectedDate.length === 4) {
+                  selectParam.selectedDate = JSON.stringify([selectParam.selectedDate + '-01-01', selectParam.selectedDate + '-12-31'])
+                }
               }
+
             }
 
             const route = router.resolve({
@@ -40,9 +47,12 @@ const setChart = (option, chartId, allowClick, selectParam) => {
             window.open(route.href, "_blank");
           } else if (params.componentType === 'series' && params.seriesType === 'bar') {
             if (params.name === '已立法') {
-              selectParam.selectedStauts = 1
+              selectParam.selectedStatus = 1
             } else {
-              selectParam.selectedStauts = 0
+              selectParam.selectedStatus = 0
+            }
+            if (selectParam.selectedDate.length === 4) {
+              selectParam.selectedDate = JSON.stringify([selectParam.selectedDate + '-01-01', selectParam.selectedDate + '-12-31'])
             }
             const route = router.resolve({
               path: "/dataLibrary/countryBill",
@@ -52,11 +62,13 @@ const setChart = (option, chartId, allowClick, selectParam) => {
           } else {
             console.log('当前点击', selectParam, params.seriesName, params.name);
             if (params.seriesName !== '通过率') {
-              selectParam = {
-                selectedDate: JSON.stringify(getMonthRange(params.name)),
-                status: params.seriesName === '通过法案' ? 1 : 0,
-                ...selectParam
+              selectParam.selectedDate = JSON.stringify(getMonthRange(params.name))
+              if (params.seriesName === '通过法案') {
+                selectParam.selectedStatus = 1
+              } else {
+                selectParam.selectedStatus = null
               }
+
               const route = router.resolve({
                 path: "/dataLibrary/countryBill",
                 query: selectParam

src/views/bill/billHome/index.vue

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

src/views/bill/billHome/utils/multiLineChart.js

@@ -3,20 +3,20 @@ import * as echarts from 'echarts'
 const getMultiLineChart = (dataX, dataY1, dataY2, dataY3) => {
   return {
     tooltip: {
-      trigger: 'axis',
+      trigger: 'item',
       axisPointer: {
         type: 'cross',
         label: {
           backgroundColor: '#6a7985'
         }
       },
-      formatter: function (params) {
-        let res = params[0].name + '<br/>';
-        params.forEach(item => {
-            res += item.marker + item.seriesName + ': ' + item.value + (item.seriesName === '通过率' ? '%' : '') + '<br/>';
-        });
-        return res;
-      }
+      // formatter: function (params) {
+      //   let res = params[0].name + '<br/>';
+      //   params.forEach(item => {
+      //       res += item.marker + item.seriesName + ': ' + item.value + (item.seriesName === '通过率' ? '%' : '') + '<br/>';
+      //   });
+      //   return res;
+      // }
     },
     grid: {
       width: '96%',

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

@@ -78,7 +78,7 @@ const props = defineProps({
     type: String,
     default: ''
   },
-  chartTypeList : {
+  chartTypeList: {
     type: Array,
     default: []
   }
@@ -88,15 +88,19 @@ const chartItemList = computed(() => {
   let arr = []
   props.chartTypeList.forEach(item => {
     defaultChartTypeList.forEach(val => {
-      if(val.name === item) {
+      if (val.name === item) {
         arr.push(val)
       }
     })
   })
+
   arr.forEach(item => {
     item.active = false
   })
   arr[0].active = true
+
+  // console.log('arr', arr);
+
   return arr
 })
 

src/views/dataLibrary/index.vue

@@ -478,12 +478,13 @@ const handleClickToolBox = () => {
 
 onMounted(() => {
   const path = route.path
+  console.log(decodeURI(route.fullPath));
+  
   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