From 1ef3af98acebc40d86c22ca0c6c02a87e6515a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Fri, 2 Sep 2022 16:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/search/index.vue      | 47 ++++++++++---------
 .../views/regulatoryEarlyWarning/index.vue    | 44 +++++++++--------
 2 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index cf5a34acc..6184eda9e 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -191,7 +191,7 @@
       searchQuery() {
         if (this.isDefault) {
           let startTime = moment(new Date()).format('YYYY-MM-DD')
-          let endTime = this.haflYear()
+          let endTime = this.getNowdate()
           if (this.queryParam['WarnTime'].length == 0) {
             this.queryParam['WarnTime'] = [startTime, endTime]
           }
@@ -203,7 +203,8 @@
         this.queryParam = {}
         if (this.isDefault) {
           let startTime = moment(new Date()).format('YYYY-MM-DD')
-          let endTime = this.haflYear()
+          let endTime = this.getNowdate()
+          console.log(endTime)
           this.queryParam['WarnTime'] = [startTime, endTime]
           this.queryParam = { ...this.queryParam }
         }
@@ -225,26 +226,30 @@
           }
         })
       },
-      haflYear() {
-        // 先获取当前时间
-        var curDate = (new Date()).getTime()
-        // 将半年的时间单位换算成毫秒
-        var halfYear = 365 / 2 * 24 * 3600 * 1000
-        // 半年前的时间（毫秒单位）
-        var pastResult = curDate + halfYear
-        // 日期函数，定义起点为半年前
-        var pastDate = new Date(pastResult)
-        var pastYear = pastDate.getFullYear()
-        var pastMonth = pastDate.getMonth() + 1
-        var pastDay = pastDate.getDate()
-        if (pastMonth >= 1 && pastMonth <= 9) {
-          pastMonth = '0' + pastMonth
+      getNowdate(){
+        var date_now = new Date()//获取当前时间
+        var year = date_now.getFullYear()//获取当前时间的年份
+        var month = date_now.getMonth()//获取当前时间的月份
+        var day = date_now.getDate()//获取当前时间的日
+        var days = new Date(year,month,0)//将获取到的年月赋值给days
+        days = days.getDate()//获取当前年月的日
+        var year2 = year
+        var month2 =  parseInt(month+7)//获取当前月份的1一个月以后的月份
+        if(month2 > 12){
+          year2 = parseInt(year2) + 1
+          month2 = parseInt(month2) % 12
+        }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
+        var day2 = day
+        var days2 = new Date(year2,month2,0)
+        days2 = days2.getDate()
+        if(day2>days2){
+          day2 = days2
+        }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
+        if(month2 < 10){
+          month2 = '0' + month2
         }
-        if (pastDay >= 0 && pastDay <= 9) {
-          pastDay = '0' + pastDay
-        }
-        var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1)
-        return endDate
+        var time = year2 + '-' + month2 + '-' + day2
+        return time
       },
       dateChange(item) {
         this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue
index 1629ad194..5920517da 100644
--- a/jero-web/src/views/regulatoryEarlyWarning/index.vue
+++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue
@@ -273,32 +273,36 @@
       },
       clearSelected() {
         let startTime = moment(new Date()).format('YYYY-MM-DD')
-        let endTime = this.haflYear()
+        let endTime = this.getNowdate()
         this.searchParmes['WarnTime'] = [startTime, endTime]
         this.searchParmes = { ...this.searchParmes }
         this.pageNo = 1
         this.getList()
       },
-      haflYear() {
-        // 先获取当前时间
-        var curDate = (new Date()).getTime()
-        // 将半年的时间单位换算成毫秒
-        var halfYear = 365 / 2 * 24 * 3600 * 1000
-        // 半年前的时间（毫秒单位）
-        var pastResult = curDate + halfYear
-        // 日期函数，定义起点为半年前
-        var pastDate = new Date(pastResult)
-        var pastYear = pastDate.getFullYear()
-        var pastMonth = pastDate.getMonth() + 1
-        var pastDay = pastDate.getDate()
-        if (pastMonth >= 1 && pastMonth <= 9) {
-          pastMonth = '0' + pastMonth
+      getNowdate(){
+        var date_now = new Date()//获取当前时间
+        var year = date_now.getFullYear()//获取当前时间的年份
+        var month = date_now.getMonth()//获取当前时间的月份
+        var day = date_now.getDate()//获取当前时间的日
+        var days = new Date(year,month,0)//将获取到的年月赋值给days
+        days = days.getDate()//获取当前年月的日
+        var year2 = year
+        var month2 =  parseInt(month+7)//获取当前月份的1一个月以后的月份
+        if(month2 > 12){
+          year2 = parseInt(year2) + 1
+          month2 = parseInt(month2) % 12
+        }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
+        var day2 = day
+        var days2 = new Date(year2,month2,0)
+        days2 = days2.getDate()
+        if(day2>days2){
+          day2 = days2
+        }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
+        if(month2 < 10){
+          month2 = '0' + month2
         }
-        if (pastDay >= 0 && pastDay <= 9) {
-          pastDay = '0' + pastDay
-        }
-        var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1)
-        return endDate
+        var time = year2 + '-' + month2 + '-' + day2
+        return time
       },
       pageOnChange(page) {
         this.pageNo = page