From be51b4e958e5581ea9622daa1ff5d46e5e5c3f98 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Sat, 21 Aug 2021 20:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/data/list/index.vue | 54 ++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue index 43d8133..ebf4546 100644 --- a/src/pages/data/list/index.vue +++ b/src/pages/data/list/index.vue @@ -512,34 +512,36 @@ export default { if(!this.frequency) return util.warningMsg('请选择数据频率') let invalid = false - let startTime = new Date(this.startTime) - let endTime = new Date(this.endTime) - let frequency = this.frequency - - // 只要选择的不是日频,则要判断选择的日期区间有没有包含这段频率对应的完整交易日段 - // 比如选的是周频,则判断选择的时间区间有没有包含一段完整的星期交易日,即星期1~5, - // 选的是月频的话,则判断选择的时间区间有没有包含一个完整的月份,即30天;年份同理 - if(frequency == 2){ - let week = [] - while(startTime <= endTime){ - let weekNum = startTime.getDay() - if(weekNum == 0) weekNum = 7 - week.push(weekNum) - startTime.setTime(startTime.getTime() + 86400000) - } - // 如果没有包含1~5,则提示请选择完整区间,下面同理 - for(let i = 1;i <= 5;i++){ - if(!week.includes(i)){ - invalid = true - break + if(this.startTime && this.endTime){ + let startTime = new Date(this.startTime) + let endTime = new Date(this.endTime) + let frequency = this.frequency + + // 只要选择的不是日频,则要判断选择的日期区间有没有包含这段频率对应的完整交易日段 + // 比如选的是周频,则判断选择的时间区间有没有包含一段完整的星期交易日,即星期1~5, + // 选的是月频的话,则判断选择的时间区间有没有包含一个完整的月份,即30天;年份同理 + if(frequency == 2){ + let week = [] + while(startTime <= endTime){ + let weekNum = startTime.getDay() + if(weekNum == 0) weekNum = 7 + week.push(weekNum) + startTime.setTime(startTime.getTime() + 86400000) + } + // 如果没有包含1~5,则提示请选择完整区间,下面同理 + for(let i = 1;i <= 5;i++){ + if(!week.includes(i)){ + invalid = true + break + } } + }else if(frequency == 3){ + if((endTime.getTime() - startTime.getTime()) / 86400000 < 30) invalid = true + }else if(frequency == 4){ + if((endTime.getTime() - startTime.getTime()) / 86400000 < 90) invalid = true + }else if(frequency == 5){ + if((endTime.getTime() - startTime.getTime()) / 86400000 < 365) invalid = true } - }else if(frequency == 3){ - if((endTime.getTime() - startTime.getTime()) / 86400000 < 30) invalid = true - }else if(frequency == 4){ - if((endTime.getTime() - startTime.getTime()) / 86400000 < 90) invalid = true - }else if(frequency == 5){ - if((endTime.getTime() - startTime.getTime()) / 86400000 < 365) invalid = true } if(invalid) return util.warningMsg('请选择完整区间')