修改法规预警的搜索

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

@@ -194,7 +194,7 @@
         if (this.isDefault) {
           let startTime = moment(new Date()).format('YYYY-MM-DD')
           let endTime = this.getNewDate('after', 6)
-          this.queryParam['warningTime'] = [startTime, endTime]
+          this.queryParam['WarnTime'] = [startTime, endTime]
           this.queryParam = { ...this.queryParam }
         }
         eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
@@ -208,10 +208,9 @@
             this.searchList = res.result
             if (this.searchQueryList && this.searchQueryList.length > 0) {
               this.searchList = this.searchList.concat(this.searchQueryList)
-              let startTime = moment(new Date()).format('YYYY-MM-DD')
+              if (this.isDefault) {
-              let endTime = this.getNewDate('after', 6)
+                this.searchReset()
-              this.queryParam['warningTime'] = [startTime, endTime]
+              }
-              this.queryParam = { ...this.queryParam }
             }
           }
         })

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

@@ -74,7 +74,8 @@
         //url传参严格按照当前命名
         url: {
           seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
-          list: '/LawsWarn/queryPageInfo'
+          list: '/LawsWarn/queryPageInfo',
+          pullMessage: ''
         },
         activeTab: this.$t('ImplementationDate'),
         loading: false,
@@ -167,7 +168,7 @@
       }
     },
     mounted() {
-      this.getList()
+      // this.getList()
       eventBUs.$on('searchQuery', search => {
         Object.keys(search).forEach(res => {
           if (search[res] instanceof Array) {
@@ -178,11 +179,6 @@
         this.searchParmes = search
         this.getList()
       })
-      eventBUs.$on('searchReset', target => {
-        this.searchParmes = {}
-        this.pageNo = 1
-        this.getList()
-      })
     },
     methods: {
       callback(tab) {
@@ -193,13 +189,87 @@
         this.selectedRowKeys = value
       },
       handleCompare() {
-
+        if (this.selectedRowKeys.length > 0) {
+          this.$nextTick(() => {
+            this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       },
       handleExport() {
 
       },
       clearSelected() {
+        let startTime = moment(new Date()).format('YYYY-MM-DD')
+        let endTime = this.getNewDate('after', 6)
+        this.searchParmes['WarnTime'] = [startTime, endTime]
+        this.searchParmes = { ...this.searchParmes }
+        this.pageNo = 1
+        this.getList()
+      },
+      getNewDate(flag, many) {
 
+        const thirtyDays = [4, 6, 9, 11] // 30天的月份
+
+        const thirtyOneDays = [1, 3, 5, 7, 8, 10, 12] // 31天的月份
+
+        const currDate = new Date() // 今天日期
+
+        const year = currDate.getFullYear()
+
+        let month = currDate.getMonth() + 1
+
+        let targetDateMilli = 0
+
+        let GMTDate = '' // 中国标准时间
+
+        let targetYear = '' // 年
+
+        let targetMonth = '' // 月
+
+        let targetDate = '' // 日
+
+        let dealTargetDays = '' // 目标日期
+
+        const isLeapYear = !!((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) // 是否是闰年
+
+        let countDays = 0 // 累计天数
+
+        for (let i = 0; i < many; i++) {
+
+          if (flag === 'before') {
+
+            month = month - 1 <= 0 ? 12 : month - 1
+
+          } else {
+
+            month = month + 1 > 12 ? 1 : month + 1
+
+          }
+
+          thirtyDays.includes(month) ? (countDays += 30) : thirtyOneDays.includes(month) ? (countDays += 31) : isLeapYear ? (countDays += 29) : (countDays += 28)
+        }
+
+        targetDateMilli = currDate.setDate(
+          currDate.getDate() - (flag === 'before' ? countDays : countDays * -1)
+        )
+
+        GMTDate = new Date(targetDateMilli)
+
+        targetYear = GMTDate.getFullYear()
+
+        targetMonth = GMTDate.getMonth() + 1
+
+        targetDate = GMTDate.getDate()
+
+        targetMonth = targetMonth.toString().padStart(2, '0')
+
+        targetDate = targetDate.toString().padStart(2, '0')
+
+        dealTargetDays = `${targetYear}-${targetMonth}-${targetDate}`
+
+        return dealTargetDays
       },
       pageOnChange(page) {
         this.pageNo = page