diff --git a/jshERP-web/src/views/system/LogList.vue b/jshERP-web/src/views/system/LogList.vue index e14da5c2..3eb3e82d 100644 --- a/jshERP-web/src/views/system/LogList.vue +++ b/jshERP-web/src/views/system/LogList.vue @@ -20,7 +20,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import JEllipsis from '@/components/jeecg/JEllipsis' - import { getBeforeFormatDate } from '@/utils/util' + import { getFormatDate, getPrevMonthFormatDate } from '@/utils/util' import {getAction } from '@/api/manage' import moment from 'moment' @@ -113,12 +113,10 @@ clientIp:'', tenantLoginName:'', tenantType:'', - beginTime: getBeforeFormatDate(30), - endTime: moment().format('YYYY-MM-DD'), + beginTime: getPrevMonthFormatDate(1), + endTime: getFormatDate(), + createTimeRange: [moment(getPrevMonthFormatDate(1)), moment(getFormatDate())], }, - dateFormat: 'YYYY-MM-DD', - currentDay: moment().format('YYYY-MM-DD'), - defaultTimeStr: '', tabKey: "1", isManage: false, // 表头 @@ -160,13 +158,14 @@ }, created() { this.initUserInfo() - this.defaultTimeStr = [moment(getBeforeFormatDate(30), this.dateFormat), moment(this.currentDay, this.dateFormat)] }, methods: { onDateChange: function (value, dateString) { - console.log(dateString[0],dateString[1]); - this.queryParam.beginTime=dateString[0]; - this.queryParam.endTime=dateString[1]; + this.queryParam.beginTime=dateString[0] + this.queryParam.endTime=dateString[1] + if(dateString[0] && dateString[1]) { + this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])] + } }, onDateOk(value) { console.log(value); @@ -179,10 +178,10 @@ clientIp:'', tenantLoginName:'', tenantType:'', - beginTime: getBeforeFormatDate(30), - endTime: moment().format('YYYY-MM-DD') + beginTime: getPrevMonthFormatDate(1), + endTime: getFormatDate(), + createTimeRange: [moment(getPrevMonthFormatDate(1)), moment(getFormatDate())], } - this.defaultTimeStr = [moment(getBeforeFormatDate(30), this.dateFormat), moment(this.currentDay, this.dateFormat)] this.loadData(1); }, initUserInfo() {