diff --git a/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue b/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue index 078579f..bbd8a94 100644 --- a/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue +++ b/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue @@ -491,7 +491,19 @@ export default { //初始化时间轴 const initTimeLine = (callback = null, ...params) => { options.times = []; - options.currentTime = moment(options.date).hour(parseInt(options.currentHour) /*+ options.onPitchTime*/).minute(options.currentElement === 'six-minute' ? 30 : 0).format('YYYY-MM-DD HH:mm:ss'); + + if (options.currentTime == null){ + const now = moment(); + options.currentHour = now.format('HH') + const offset = now.minute() % options.apiTimeInterval + options.currentTime = moment(options.date).hour(now.hour() /*+ options.onPitchTime*/).minute(now.minute()).add(-offset, 'minute').add(-options.apiTimeInterval, 'minute').format('YYYY-MM-DD HH:mm:00'); + }else{ + let time = moment(options.currentTime).hour(parseInt(options.currentHour)); + time = time.add(- time.minute() % options.apiTimeInterval, 'minute').add(-options.apiTimeInterval, 'minute'); + // options.currentTime = moment(options.currentTime).hour(parseInt(options.currentHour) /*+ options.onPitchTime*/).minute(options.currentElement === 'six-minute' ? 30 : 0).format('YYYY-MM-DD HH:mm:ss'); + options.currentTime = time.format('YYYY-MM-DD HH:mm:ss'); + } + // options.currentTime = moment(options.date).hour(parseInt(options.currentHour) /*+ options.onPitchTime*/).minute(options.currentElement === 'six-minute' ? 30 : 0).format('YYYY-MM-DD HH:mm:ss'); options.titleEndTime = options.currentTime let now = moment(options.date).hour(parseInt(options.currentHour) + options.apiTimeLength).minute(options.currentElement === 'six-minute' ? 36 : 30); let minute = now.minute();