修改法规预警搜索时间问题

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

@@ -230,7 +230,12 @@
           //   this.queryParam['WarnTimeText'] = '2'
           // }
           let startTime = moment(new Date()).format('YYYY-MM-DD')
-          let endTime = this.getNowdate()
+          let endTime = ''
+          if (!this.queryParam['WarnTimeText']){
+            endTime = '2099-01-01'
+          }else{
+            endTime = this.getNowdate()
+          }
           if(this.queryParam['WarnTimeText'] == '5'){
             this.queryParam['WarnTime'] = [endTime, startTime]
           }else{

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

@@ -158,7 +158,7 @@
             {
               value: '6',
               name: this.$t('inRecentYear3')
-              },
+            }
           ]
         }
       ],
@@ -316,11 +316,13 @@
       this.selectedRowKeys = []
     },
     clearSelected() {
+      let endTime = ''
       if (!this.searchParmes['WarnTimeText']) {
-          this.searchParmes['WarnTimeText'] = '2'
+        endTime = '2099-01-01'
+      } else {
+        endTime = this.getNowdate()
       }
       let startTime = moment(new Date()).format('YYYY-MM-DD')
-        let endTime = this.getNowdate()
       this.searchParmes['WarnTime'] = [startTime, endTime]
       this.searchParmes = { ...this.searchParmes }
       this.pageNo = 1
@@ -341,10 +343,47 @@
       } else if (this.searchParmes['WarnTimeText'] == '4') {
         monthData = 25
         yearData = 2
-        }else if (this.queryParam['WarnTimeText'] == '6') {
+      } else if (this.searchParmes['WarnTimeText'] == '5') {
+        monthData = 7
+        yearData = -1
+      } else if (this.searchParmes['WarnTimeText'] == '6') {
         monthData = 37
         yearData = 3
       }
+      if (this.searchParmes['WarnTimeText'] == '5') {
+        var time = new Date()
+        time.setTime(time.getTime())
+        var s2 = time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate()
+        var monthNum = 6 //要减的月数(6)自己定义
+        var dateArr = s2.split('-') //s2当前时间
+        var year = dateArr[0] //获取当前日期的年份
+        var month = dateArr[1] //获取当前日期的月份
+        var day = dateArr[2] //获取当前日期的日
+        var days = new Date(year, month, 0)
+        days = days.getDate() //获取当前日期中月的天数
+        var year2
+        if (month < 6) {
+          year2 = year - 1
+        } else {
+          year2 = year
+        }
+        var month2 = parseInt(month) - monthNum
+        if (month2 <= 0) {
+          year2 = parseInt(year2) - parseInt(month2 / 12 == 0 ? 1 : parseInt(month2) / 12)
+          month2 = 12 - (Math.abs(month2) % 12)
+        }
+        var day2 = day
+        var days2 = new Date(year2, month2, 0)
+        days2 = days2.getDate()
+        if (day2 > days2) {
+          day2 = days2
+        }
+        if (month2 < 10) {
+          month2 = '0' + month2
+        }
+        var t2 = year2 + '-' + month2 + '-' + day2
+        return t2
+      } else {
         var date_now = new Date()//获取当前时间
         var year = date_now.getFullYear()//获取当前时间的年份
         var month = date_now.getMonth()//获取当前时间的月份
@@ -368,7 +407,10 @@
         }
         var time = year2 + '-' + month2 + '-' + day2
         return time
+      }
+
     },
+
     pageOnChange(page) {
       this.pageNo = page
       this.getList()