diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 7dca687dc..2c10b0303 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -197,3 +197,7 @@ MODIFY COLUMN `msg_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_c MODIFY COLUMN `msg_content_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息详情（英文）' AFTER `msg_content`, ADD COLUMN `msg_content_cn` text NULL COMMENT '消息内容（中文）' AFTER `msg_content_info`, ADD COLUMN `msg_content_info_cn` text NULL COMMENT '消息内容（中文）' AFTER `msg_content_cn`; + + +-- 上报库-参数项查看页表头 责任领域更新为展示列表sql 2023-02-17 未同步生产环境 +UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 1 WHERE `id` = 'c31d68e204960c073b1fb8126a443492'; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index a84996dc9..4f27f21e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1430,6 +1430,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl - {{$t('beEqualTo')}} + {{$t('beEqualTo')}} {{$t('contain')}} @@ -106,15 +106,15 @@ {{$t('in')}} - {{$t('notEqual')}} - - {{$t('granter')}} - - {{$t('greaterOrEqual')}} - - {{$t('less')}} - - {{$t('lessOrEqual')}} + {{$t('notEqual')}} + + {{$t('afterdate')}} + + {{$t('afterdatein')}} + + {{$t('beforedate')}} + + {{$t('beforedatein')}} diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index e73f015c5..5b2671df5 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -231,7 +231,11 @@ // } let startTime = moment(new Date()).format('YYYY-MM-DD') let endTime = this.getNowdate() - this.queryParam['WarnTime'] = [startTime, endTime] + if(this.queryParam['WarnTimeText'] == '5'){ + this.queryParam['WarnTime'] = [endTime, startTime] + }else{ + this.queryParam['WarnTime'] = [startTime, endTime] + } this.queryParam = { ...this.queryParam } } eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) @@ -288,30 +292,69 @@ } else if (this.queryParam['WarnTimeText'] == '4') { monthData = 25 yearData = 2 + }else if (this.queryParam['WarnTimeText'] == '5') { + monthData = 7 + yearData = -1 } - 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 + monthData)//获取当前月份的1一个月以后的月份 - if (month2 > 12) { - year2 = parseInt(year2) + yearData - 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(this.queryParam['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()//获取当前时间的月份 + var day = date_now.getDate()//获取当前时间的日 + var days = new Date(year, month, 0)//将获取到的年月赋值给days + days = days.getDate()//获取当前年月的日 + var year2 = year + var month2 = parseInt(month + monthData)//获取当前月份的1一个月以后的月份 + if (month2 > 12) { + year2 = parseInt(year2) + yearData + 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 + } + var time = year2 + '-' + month2 + '-' + day2 + return time } - 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 2e55ad9f6..d4952cef3 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -143,6 +143,10 @@ value: '2', name: this.$t('inRecentMonths6') }, + { + value: '5', + name: this.$t('inRecentMonthsin6') + }, { value: '3', name: this.$t('inRecentYear1') @@ -150,7 +154,8 @@ { value: '4', name: this.$t('inRecentYear2') - } + }, + ] } ],