diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js index bb7ef1fe..cbb04ae6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js @@ -77,14 +77,19 @@ export const searchFormList = [ type: "datePicker", options: { style:{width:'100%'}, - type: "datetimerange", - format: "yyyy-MM-dd HH:mm:ss", - valueFormat: "yyyy-MM-dd HH:mm:ss", + type: "daterange", + format: "yyyy-MM-dd", + valueFormat: "yyyy-MM-dd", + pickerOptions:{ + disabledDate(time) { + return time.getTime() > Date.now() || time.getTime() Date.now() || time.getTime() 0 ? daterange[0] : "", + startTime: daterange && daterange.length > 0 ? (daterange[0]+' 00:00:00') : "", // endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "", - completeTime: daterange && daterange.length > 0 ? daterange[1] : "", + completeTime: daterange && daterange.length > 0 ? (daterange[1]+' 23:59:59'): "", startStakeMark: stakeMark, endStakeMark: endStakeMark, };