Browse Source

Merge branch 'bug7288' into debug

shanbinzhang 1 month ago
parent
commit
017a7e94f3
3 changed files with 10 additions and 8 deletions
  1. 6 6
      src/hooks/chart/config.js
  2. 2 1
      src/views/chartETA/ChartDetail.vue
  3. 2 1
      src/views/myETA/ChartDetail.vue

+ 6 - 6
src/hooks/chart/config.js

@@ -215,7 +215,7 @@ export const relevanceUnitEnMap={
 //图表年份筛选项
 export const yearSelectOpt = [
 	{
-		name: '15年至',
+		name: '15年至最新值',
 		value: 3,
 	},
 	// {
@@ -227,16 +227,16 @@ export const yearSelectOpt = [
 	// 	value: 8,
 	// },
 	{
-		name: '20年至',
+		name: '20年至最新值',
 		value: 9,
 	},
 	{
-		name: '21年至今',
-		value: 4,
+		name: '23年至最新值',
+		value: 12,
 	},
 	{
-		name: '22年至今',
-		value: 11
+		name: '24年至最新值',
+		value: 13
 	},
 ]
 

+ 2 - 1
src/views/chartETA/ChartDetail.vue

@@ -1389,7 +1389,8 @@ function openDateSelect(){
                 margin-bottom: 20px;
                 .item{
                     display: inline-block;
-                    width: 80px;
+                    padding: 0 12px;
+                    //width: 80px;
                     height: 36px;
                     text-align: center;
                     line-height: 36px;

+ 2 - 1
src/views/myETA/ChartDetail.vue

@@ -1521,7 +1521,8 @@ const showSaveToMaterial=ref(false)
                 margin-bottom: 20px;
                 .item{
                     display: inline-block;
-                    width: 80px;
+                    // width: 80px;
+                    padding: 0 12px;
                     height: 36px;
                     text-align: center;
                     line-height: 36px;