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

src/api/comprehensiveSearch/index.js

@@ -12,6 +12,7 @@ export function search(data) {
     })
 }
 
+// 智库列表
 export function getThinkTankList() {
     return request({
         method: 'GET',
@@ -19,9 +20,50 @@ export function getThinkTankList() {
     })
 }
 
+// 立法阶段
 export function getStatusList() {
     return request({
         method: 'GET',
         url: `/temporarySearch/search-info/dBillStage`,
     })
 }
+
+// 省名字列表
+export function getProvinceList() {
+    return request({
+        method: 'GET',
+        url: `/temporarySearch/search-info/all-provinceName`,
+    })
+}
+
+// 国家列表
+export function getCountryList() {
+    return request({
+        method: 'GET',
+        url: `/temporarySearch/search-info/all-countryName`,
+    })
+}
+
+// 实体类型
+export function getEntityTypes() {
+    return request({
+        method: 'GET',
+        url: `/temporarySearch/search-info/entityTypes`,
+    })
+}
+
+// 物项类别
+export function getMaterialCategory() {
+    return request({
+        method: 'GET',
+        url: `/temporarySearch/search-info/all-materialCategory`,
+    })
+}
+
+// 商业管制清单-管控原因
+export function getControlReason() {
+    return request({
+        method: 'GET',
+        url: `/temporarySearch/search-info/all-controlReason`,
+    })
+}
\ No newline at end of file

src/stores/tagsView.js

@@ -12,6 +12,7 @@ const useTagsViewStore = defineStore('tags-view', {
       this.addCachedView(view)
     },
     addVisitedView(view) {
+      this.visitedViews = localStorage.getItem('visitedViews') && JSON.parse(localStorage.getItem('visitedViews')) || []
       this.visitedViews.forEach(item => {
         item.active = false
       })
@@ -23,8 +24,8 @@ const useTagsViewStore = defineStore('tags-view', {
           ...view,
           title: view.meta?.title || '未命名'
         })
+        localStorage.setItem('visitedViews', JSON.stringify(this.visitedViews))
       } else {
-
         this.visitedViews.forEach(v => {
           if (v.path === view.path) {
             v.active = true
@@ -49,7 +50,7 @@ const useTagsViewStore = defineStore('tags-view', {
         if (index !== -1) {
           this.visitedViews.splice(index, 1)
         }
-
+        localStorage.setItem('visitedViews', JSON.stringify(this.visitedViews))
         resolve([...this.visitedViews])
       })
     },
@@ -64,6 +65,13 @@ const useTagsViewStore = defineStore('tags-view', {
       }
     },
 
+    loadVisitedViewFromLocalStorage() {
+      const saved = localStorage.getItem('visitedViews')
+      if (saved) {
+        this.items = JSON.parse(saved)
+      }
+    },
+
 
     // 关闭其他/右侧/全部
     delOthersViews(view) {

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

@@ -4,7 +4,7 @@
       <div class="header-top">
         <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
           :select-name="selectedArea" @update:select-text="handleSelectArea" />
-        <SelectBox :placeholder-name="DatePlaceHolder" select-title="提出时间" :select-list="dateList"
+        <SelectBox :placeholder-name="DatePlaceHolder" select-title="提案时间" :select-list="dateList"
           :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"
@@ -53,7 +53,7 @@
           <ChartHeader :list="staticsDemensionList" @clickItem="handleClickDemensionItem">
             <template #chart-header-right>
               <el-select v-model="selectedTime" placeholder="选择时间" style="width: 150px"
-                v-show="curDemension === '提案时间'">
+                v-show="curDemension === '提案时间'" @change="handleChangeTime">
                 <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
 
@@ -123,7 +123,8 @@
             <el-table-column type="selection" width="40" />
             <el-table-column label="法案名称" width="455">
               <template #default="scope">
-                <span class="title-item text-compact-bold" @click="handleClickToDetail(scope.row)">{{ scope.row.originalTitle
+                <span class="title-item text-compact-bold" @click="handleClickToDetail(scope.row)">{{
+                  scope.row.originalTitle
                   }}</span>
               </template>
             </el-table-column>
@@ -184,10 +185,20 @@ const handleSwitchChartData = () => {
     const curDemensionItem = staticsDemensionList.value.filter(item => {
       return item.name === curDemension.value
     })[0]
-    timer1.value = setTimeout(() => {
+    // timer1.value = setTimeout(() => {
       activeChart.value = curDemensionItem.chartTypeList[0]
+      if (curDemension.value === '提案时间') {
+        if (selectedTime.value === '按月度统计') {
           curChartData.value = curDemensionItem.data
-    })
+        } else if (selectedTime.value === '按季度统计') {
+          curChartData.value = curDemensionItem.quatarData
+        } else {
+          curChartData.value = curDemensionItem.yearData
+        }
+      } else {
+        curChartData.value = curDemensionItem.data
+      }
+    // })
   }
 }
 
@@ -206,10 +217,12 @@ const staticsDemensionList = ref([
       dataY: []
     },
     quatarData: {
-
+      dataX: [],
+      dataY: []
     },
     yearData: {
-
+      dataX: [],
+      dataY: []
     }
   },
   {
@@ -273,11 +286,17 @@ const handleClickDemensionItem = (val) => {
   curDemension.value = val.name
   timer2.value = setTimeout(() => {
     activeChart.value = val.chartTypeList[0]
+    if (curDemension.value === '发布时间' && selectedTime.value === '按年度统计') {
+      curChartData.value = val.yearData
+    } else if (curDemension.value === '发布时间' && selectedTime.value === '按季度统计') {
+      curChartData.value = val.quatarData
+    } else {
       curChartData.value = val.data
+    }
   })
 }
 
-const selectedTime = ref('按月统计')
+const selectedTime = ref('按年度统计')
 const timeList = ref([
   {
     label: '按年度统计',
@@ -293,6 +312,27 @@ const timeList = ref([
   },
 ])
 
+const handleChangeTime = value => {
+  let curChart = activeChart.value
+  activeChart.value = ''
+  if (value === '按月度统计') {
+    setTimeout(() => {
+      activeChart.value = curChart
+      curChartData.value = staticsDemensionList.value[0].data
+    })
+  } else if (value === '按季度统计') {
+    setTimeout(() => {
+      activeChart.value = curChart
+      curChartData.value = staticsDemensionList.value[0].quatarData
+    })
+  } else {
+    setTimeout(() => {
+      activeChart.value = curChart
+      curChartData.value = staticsDemensionList.value[0].yearData
+    })
+  }
+}
+
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
@@ -307,7 +347,7 @@ const activeTagList = computed(() => {
   if (selectedDate.value === '自定义') {
     arr.push(
       {
-        tag: '提出时间',
+        tag: '提案时间',
         name: customTime.value.join('至')
       }
     )
@@ -372,7 +412,7 @@ const handleCloseCurTag = (tag, index) => {
     case '科技领域':
       selectedArea.value = '全部领域'
       break
-    case '提出时间':
+    case '提案时间':
       selectedDate.value = ''
       break
     case '所属党派':
@@ -541,7 +581,7 @@ const handleSelectArea = (value) => {
   selectedArea.value = value
 }
 
-// 提出时间
+// 提案时间
 const DatePlaceHolder = ref('请选择时间')
 const selectedDate = ref('')
 const dateList = ref([
@@ -843,6 +883,14 @@ const fetchTableData = async () => {
         dataX: Object.keys(res.data.aggregationsDate),
         dataY: Object.values(res.data.aggregationsDate).map(value => Number(value))
       }
+      staticsDemensionList.value[0].quatarData = {
+        dataX: Object.keys(res.data.aggregationsQuarter),
+        dataY: Object.values(res.data.aggregationsQuarter).map(value => Number(value))
+      }
+      staticsDemensionList.value[0].yearData = {
+        dataX: Object.keys(res.data.aggregationsYear),
+        dataY: Object.values(res.data.aggregationsYear).map(value => Number(value))
+      }
       staticsDemensionList.value[1].data = Object.entries(res.data.aggregationsDomain).map(([key, value]) => ({
         name: key,
         value: Number(value)
@@ -860,7 +908,7 @@ const fetchTableData = async () => {
         value: Number(value)
       }))
       staticsDemensionList.value[5].data = Object.entries(res.data.aggregationsStatus).map(([key, value]) => ({
-        name: key === '1' ? '通过' : '提出',
+        name: key,
         value: Number(value)
       }))
     }

src/views/dataLibrary/components/BarChart/barChart.js

@@ -62,7 +62,9 @@ const getBarChart = (data) => {
       type: 'bar',
       data: data.dataY,
       label: {
+
         show: true,
+
         position: 'top',
         color: 'rgb(59, 65, 75)',
         fontWeight: 'regular',  // 文字加粗
@@ -72,7 +74,7 @@ const getBarChart = (data) => {
           return params.value
         },
       },
-      barWidth: 20,
+      barWidth: data.dataX.length < 60 ? 20 : 3,
       itemStyle: {
         color: function (params) {
           return new echarts.graphic.LinearGradient(0, 1, 0, 0,

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

 <template>
   <div class="wrapper">
-    <div class="show" @click="handleSwitchShowAll">
+    <div v-if="isShowAllBtn" class="show" @click="handleSwitchShowAll">
       <div class="text text-compact">{{ isShowAll ? '收起' : '展开全部' }}</div>
       <div class="icon">
         <img v-if="isShowAll" src="./arrow-up.svg" alt="">
@@ -23,6 +23,10 @@ const props = defineProps({
   isShowAll: {
     type: Boolean,
     default: false
+  },
+  isShowAllBtn: {
+    type: Boolean,
+    default: true
   }
 })
 

src/views/dataLibrary/components/LineChart/lineChart.js

@@ -53,6 +53,9 @@ const getLineChart = (dataX, dataY) => {
         lineStyle: {
           color: 'rgba(5, 95, 194, 1)'
         },
+        label: {
+          show: true
+        },
         areaStyle: {
           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
             offset: 0,

src/views/dataLibrary/components/PieChart/piechart.js

 import { MUTICHARTCOLORS } from "@/common/constant";
 const getPieChart = (data) => {
   const colorList = MUTICHARTCOLORS
+  let showData = data
+  if(data.length > 14) {
+    showData = data.slice(0,13)
+    let num = 0
+    data.slice(13,).forEach(item => {
+      num = num + item.value
+    })
+    showData = [...showData, {name: '其他', value: num}]
+  }
   let option = {
     color: colorList,
+    legend: {
+      show: false
+    },
     series: [
       {
         type: 'pie',
@@ -50,7 +62,7 @@ const getPieChart = (data) => {
             labelLinePoints: points
           };
         },
-        data: data
+        data: showData
       }]
   }
   return option

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

@@ -89,4 +89,5 @@ const customTimeValue = computed({
 .select-wrapper-custom {
   width: 738px;
 }
+
 </style>
\ No newline at end of file

src/views/dataLibrary/decree/index.vue

@@ -197,7 +197,7 @@ const handleSwitchChartData = () => {
     const curDemensionItem = staticsDemensionList.value.filter(item => {
       return item.name === curDemension.value
     })[0]
-    setTimeout(() => {
+    // setTimeout(() => {
       activeChart.value = curDemensionItem.chartTypeList[0]
       if (curDemension.value === '发布时间') {
         if (selectedTime.value === '按月度统计') {
@@ -210,7 +210,7 @@ const handleSwitchChartData = () => {
       } else {
         curChartData.value = curDemensionItem.data
       }
-    })
+    // })
   }
 }
 
@@ -289,7 +289,7 @@ const handleClickDemensionItem = (val) => {
 }
 
 // 时间图表 当前选择时间
-const selectedTime = ref('按月统计')
+const selectedTime = ref('按年度统计')
 // 时间图表-时间列表
 const timeList = ref([
   {

src/views/dataLibrary/index.vue

@@ -92,6 +92,7 @@ import { ElMessage } from "element-plus";
 const router = useRouter();
 const route = useRoute();
 const tagsViewStore = useTagsViewStore();
+tagsViewStore.loadVisitedViewFromLocalStorage()
 
 // 在路由全局守卫中处理
 router.beforeEach((to, from, next) => {
@@ -348,8 +349,7 @@ const handleSiderSecondItem = item => {
 };
 
 const openedTabList = computed(() => {
-	const arr = tagsViewStore.visitedViews;
-	return arr;
+	return tagsViewStore.visitedViews;
 });
 
 const handleClickTab = tab => {
@@ -586,6 +586,7 @@ onBeforeUnmount(() => {
 	if (timer.value) {
 		clearTimeout(timer.value);
 	}
+	localStorage.setItem('visitedViews', [])
 });
 </script>
 

src/views/dataLibrary/thinkTank/index.vue

@@ -189,7 +189,7 @@ const handleSwitchChartData = () => {
     const curDemensionItem = staticsDemensionList.value.filter(item => {
       return item.name === curDemension.value;
     })[0];
-    setTimeout(() => {
+    // setTimeout(() => {
       activeChart.value = curDemensionItem.chartTypeList[0];
       if (curDemension.value === "发布时间") {
         if (selectedTime.value === "按月度统计") {
@@ -202,7 +202,7 @@ const handleSwitchChartData = () => {
       } else {
         curChartData.value = curDemensionItem.data;
       }
-    });
+    // });
   }
 };
 
@@ -281,7 +281,7 @@ const handleClickDemensionItem = val => {
 };
 
 // 时间图表 当前选择时间
-const selectedTime = ref("按月统计");
+const selectedTime = ref("按年度统计");
 // 时间图表-时间列表
 const timeList = ref([
   {