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

src/views/bill/billHome/index.vue

@@ -109,7 +109,7 @@
 					
 					<DivideHeader id="position3" class="divide3" :titleText="'数据总览'"></DivideHeader>
 					<div class="center-footer">
-						<OverviewCard class="overview-card--double box5" title="涉华法案数量" :icon="box5HeaderIcon">
+						<OverviewCard class="overview-card--double box5" title="涉华法案数量变化趋势" :icon="box5HeaderIcon">
 							<template #right>
 								<el-select v-model="box5Select" placeholder="选择领域" @change="handleBox5Change" style="width: 150px">
 									<el-option label="全部领域" value="全部领域" />
@@ -134,7 +134,7 @@
 						</OverviewCard>
 					</div>
 					<div class="center-footer1">
-						<OverviewCard class="overview-card--single box7" title="法案提出部门" :icon="box7HeaderIcon">
+						<OverviewCard class="overview-card--single box7" title="涉华法案提出部门" :icon="box7HeaderIcon">
 							<template #right>
 								<el-select v-model="box7selectetedTime" placeholder="选择时间" style="width: 90px">
 									<el-option v-for="item in box7YearList" :key="item.value" :label="item.label" :value="item.value" />
@@ -159,7 +159,7 @@
 								</template>
 							</div>
 						</OverviewCard>
-						<OverviewCard class="overview-card--single box9" title="关键条款" :icon="box7HeaderIcon">
+						<OverviewCard class="overview-card--single box9" title="涉华法案关键条款" :icon="box7HeaderIcon">
 							<div class="box9-main" id="wordCloudChart"></div>
 						</OverviewCard>
 					</div>

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

@@ -66,6 +66,7 @@ const getMultiLineChart = (dataX, dataY1, dataY2, dataY3) => {
         type: 'value',
         position: 'left',
         axisLabel: {
+            formatter: '{value}项',
             color: '#666'
         }
       },

src/views/bill/billLayout/index.vue

@@ -209,19 +209,19 @@ const mainHeaderBtnList = ref([
 		activeIcon: icon2Active,
 		name: "深度挖掘",
 		path: "/billLayout/deepDig"
+	},
+	{
+		icon: icon3,
+		activeIcon: icon3Active,
+		name: "影响分析",
+		path: "/billLayout/influence"
+	},
+	{
+		icon: icon4,
+		activeIcon: icon4Active,
+		name: "相关情况",
+		path: "/billLayout/relevantCircumstance"
 	}
-	// {
-	// 	icon: icon3,
-	// 	activeIcon: icon3Active,
-	// 	name: "影响分析",
-	// 	path: "/billLayout/influence"
-	// },
-	// {
-	// 	icon: icon4,
-	// 	activeIcon: icon4Active,
-	// 	name: "相关情况",
-	// 	path: "/billLayout/relevantCircumstance"
-	// }
 ]);
 
 const activeTitle = ref("法案概况");

src/views/bill/deepDig/processAnalysis/utils/boxplot.js

@@ -39,10 +39,10 @@ const getBoxPlotChcart = (data, unit, labelConfig = {}) => {
       }
     },
     grid: {
-      left: '5%',
-      right: '3%',
+      left: '8%',
+      right: '5%',
       top: '10%',
-      bottom: '10%'
+      bottom: '12%'
     },
     xAxis: {
       type: 'category',
@@ -59,11 +59,9 @@ const getBoxPlotChcart = (data, unit, labelConfig = {}) => {
     },
     yAxis: {
       type: 'value',
-      name: `单位：${unit}`,
-      nameTextStyle: {
-        padding: [0, 0, 0, 1520], // [上, 右, 下, 左]
-        verticalAlign: 'middle',
-        align: 'center'
+      name: '',
+      axisLabel: {
+        formatter: (value) => `${value}${unit}`
       },
       splitArea: {
         show: true