Merge branch 'master' into 'fix_20230524'

# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java

jero-web/src/common/lang/en-us.js

@@ -1333,6 +1333,7 @@ module.exports = {
   inRecentMonths6:'In recent 6 months',
   inRecentYear1:'In recent 1 year',
   inRecentYear2:'In recent 2 year',
+  inRecentYear3:'In recent 3 year',
   selectAll:'Select All',
   importLocalDisassemblyOrder:'Import local disassembly order',
   notExport:'Not exported',

jero-web/src/common/lang/zh-cn.js

@@ -1435,6 +1435,7 @@ module.exports = {
   inRecentMonths6: '近6个月内',
   inRecentYear1: '近1年内',
   inRecentYear2: '近2年内',
+  inRecentYear3: '近3年内',
   selectAll: '全选',
   importLocalDisassemblyOrder: '导入本地拆解单',
   notExport: '未导出',

jero-web/src/components/search/index.vue

@@ -245,7 +245,7 @@
         if (this.isDefault) {
           let startTime = moment(new Date()).format('YYYY-MM-DD')
           // this.queryParam['WarnTimeText'] = '2'
-          let endTime = this.getNowdate()
+          let endTime = '2099-01-01'
           this.queryParam['WarnTime'] = [startTime, endTime]
           this.queryParam = { ...this.queryParam }
         }
@@ -295,6 +295,9 @@
         }else if (this.queryParam['WarnTimeText'] == '5') {
           monthData = 7
           yearData = -1
+        }else if (this.queryParam['WarnTimeText'] == '6') {
+          monthData = 37
+          yearData = 3
         }
         if(this.queryParam['WarnTimeText'] == '5'){
           var time = new Date();

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -155,7 +155,10 @@
                 value: '4',
                 name: this.$t('inRecentYear2')
               },
-
+              {
+                value: '6',
+                name: this.$t('inRecentYear3')
+              },
             ]
           }
         ],
@@ -338,6 +341,9 @@
         } else if (this.searchParmes['WarnTimeText'] == '4') {
           monthData = 25
           yearData = 2
+        }else if (this.queryParam['WarnTimeText'] == '6') {
+          monthData = 37
+          yearData = 3
         }
         var date_now = new Date()//获取当前时间
         var year = date_now.getFullYear()//获取当前时间的年份