diff --git a/src/components/Crontab/hour.vue b/src/components/Crontab/hour.vue index 8e7c21c..db77835 100644 --- a/src/components/Crontab/hour.vue +++ b/src/components/Crontab/hour.vue @@ -78,10 +78,10 @@ watch(() => props.cron.hour, value => changeRadioValue(value)) watch([radioValue, cycleTotal, averageTotal, checkboxString], () => onRadioChange()) function changeRadioValue(value) { if (props.cron.min === '*') { - emit('update', 'min', '0', 'hour'); + emit('update', 'min', '0', 'hour') } if (props.cron.second === '*') { - emit('update', 'second', '0', 'hour'); + emit('update', 'second', '0', 'hour') } if (value === '*') { radioValue.value = 1 diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue index 103cf4c..cbb41ab 100644 --- a/src/components/Crontab/index.vue +++ b/src/components/Crontab/index.vue @@ -70,42 +70,46 @@

时间表达式

- - + + + + - - - - - - - - + + + + + + + + + +
{{item}}Cron 表达式
{{item}}Cron 表达式
- {{crontabValueObj.second}} - {{crontabValueObj.second}} - - {{crontabValueObj.min}} - {{crontabValueObj.min}} - - {{crontabValueObj.hour}} - {{crontabValueObj.hour}} - - {{crontabValueObj.day}} - {{crontabValueObj.day}} - - {{crontabValueObj.month}} - {{crontabValueObj.month}} - - {{crontabValueObj.week}} - {{crontabValueObj.week}} - - {{crontabValueObj.year}} - {{crontabValueObj.year}} - - {{crontabValueString}} - {{crontabValueString}} -
+ {{crontabValueObj.second}} + {{crontabValueObj.second}} + + {{crontabValueObj.min}} + {{crontabValueObj.min}} + + {{crontabValueObj.hour}} + {{crontabValueObj.hour}} + + {{crontabValueObj.day}} + {{crontabValueObj.day}} + + {{crontabValueObj.month}} + {{crontabValueObj.month}} + + {{crontabValueObj.week}} + {{crontabValueObj.week}} + + {{crontabValueObj.year}} + {{crontabValueObj.year}} + + {{crontabValueString}} + {{crontabValueString}} +
diff --git a/src/components/Crontab/result.vue b/src/components/Crontab/result.vue index 5a812ee..cbb49ba 100644 --- a/src/components/Crontab/result.vue +++ b/src/components/Crontab/result.vue @@ -26,289 +26,289 @@ watch(() => props.ex, () => expressionChange()) // 表达式值变化时，开始去计算结果 function expressionChange() { // 计算开始-隐藏结果 - isShow.value = false; + isShow.value = false // 获取规则数组[0秒、1分、2时、3日、4月、5星期、6年] - let ruleArr = props.ex.split(' '); + let ruleArr = props.ex.split(' ') // 用于记录进入循环的次数 - let nums = 0; + let nums = 0 // 用于暂时存符号时间规则结果的数组 - let resultArr = []; + let resultArr = [] // 获取当前时间精确至[年、月、日、时、分、秒] - let nTime = new Date(); - let nYear = nTime.getFullYear(); - let nMonth = nTime.getMonth() + 1; - let nDay = nTime.getDate(); - let nHour = nTime.getHours(); - let nMin = nTime.getMinutes(); - let nSecond = nTime.getSeconds(); + let nTime = new Date() + let nYear = nTime.getFullYear() + let nMonth = nTime.getMonth() + 1 + let nDay = nTime.getDate() + let nHour = nTime.getHours() + let nMin = nTime.getMinutes() + let nSecond = nTime.getSeconds() // 根据规则获取到近100年可能年数组、月数组等等 - getSecondArr(ruleArr[0]); - getMinArr(ruleArr[1]); - getHourArr(ruleArr[2]); - getDayArr(ruleArr[3]); - getMonthArr(ruleArr[4]); - getWeekArr(ruleArr[5]); - getYearArr(ruleArr[6], nYear); + getSecondArr(ruleArr[0]) + getMinArr(ruleArr[1]) + getHourArr(ruleArr[2]) + getDayArr(ruleArr[3]) + getMonthArr(ruleArr[4]) + getWeekArr(ruleArr[5]) + getYearArr(ruleArr[6], nYear) // 将获取到的数组赋值-方便使用 - let sDate = dateArr.value[0]; - let mDate = dateArr.value[1]; - let hDate = dateArr.value[2]; - let DDate = dateArr.value[3]; - let MDate = dateArr.value[4]; - let YDate = dateArr.value[5]; + let sDate = dateArr.value[0] + let mDate = dateArr.value[1] + let hDate = dateArr.value[2] + let DDate = dateArr.value[3] + let MDate = dateArr.value[4] + let YDate = dateArr.value[5] // 获取当前时间在数组中的索引 - let sIdx = getIndex(sDate, nSecond); - let mIdx = getIndex(mDate, nMin); - let hIdx = getIndex(hDate, nHour); - let DIdx = getIndex(DDate, nDay); - let MIdx = getIndex(MDate, nMonth); - let YIdx = getIndex(YDate, nYear); + let sIdx = getIndex(sDate, nSecond) + let mIdx = getIndex(mDate, nMin) + let hIdx = getIndex(hDate, nHour) + let DIdx = getIndex(DDate, nDay) + let MIdx = getIndex(MDate, nMonth) + let YIdx = getIndex(YDate, nYear) // 重置月日时分秒的函数(后面用的比较多) const resetSecond = function () { - sIdx = 0; + sIdx = 0 nSecond = sDate[sIdx] } const resetMin = function () { - mIdx = 0; + mIdx = 0 nMin = mDate[mIdx] - resetSecond(); + resetSecond() } const resetHour = function () { - hIdx = 0; + hIdx = 0 nHour = hDate[hIdx] - resetMin(); + resetMin() } const resetDay = function () { - DIdx = 0; + DIdx = 0 nDay = DDate[DIdx] - resetHour(); + resetHour() } const resetMonth = function () { - MIdx = 0; + MIdx = 0 nMonth = MDate[MIdx] - resetDay(); + resetDay() } // 如果当前年份不为数组中当前值 if (nYear !== YDate[YIdx]) { - resetMonth(); + resetMonth() } // 如果当前月份不为数组中当前值 if (nMonth !== MDate[MIdx]) { - resetDay(); + resetDay() } // 如果当前“日”不为数组中当前值 if (nDay !== DDate[DIdx]) { - resetHour(); + resetHour() } // 如果当前“时”不为数组中当前值 if (nHour !== hDate[hIdx]) { - resetMin(); + resetMin() } // 如果当前“分”不为数组中当前值 if (nMin !== mDate[mIdx]) { - resetSecond(); + resetSecond() } // 循环年份数组 goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) { - let YY = YDate[Yi]; + let YY = YDate[Yi] // 如果到达最大值时 if (nMonth > MDate[MDate.length - 1]) { - resetMonth(); - continue; + resetMonth() + continue } // 循环月份数组 goMonth: for (let Mi = MIdx; Mi < MDate.length; Mi++) { // 赋值、方便后面运算 let MM = MDate[Mi]; - MM = MM < 10 ? '0' + MM : MM; + MM = MM < 10 ? '0' + MM : MM // 如果到达最大值时 if (nDay > DDate[DDate.length - 1]) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue; + continue } // 循环日期数组 goDay: for (let Di = DIdx; Di < DDate.length; Di++) { // 赋值、方便后面运算 - let DD = DDate[Di]; - let thisDD = DD < 10 ? '0' + DD : DD; + let DD = DDate[Di] + let thisDD = DD < 10 ? '0' + DD : DD // 如果到达最大值时 if (nHour > hDate[hDate.length - 1]) { - resetHour(); + resetHour() if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue; + continue } // 判断日期的合法性，不合法的话也是跳出当前循环 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && dayRule.value !== 'workDay' && dayRule.value !== 'lastWeek' && dayRule.value !== 'lastDay') { - resetDay(); - continue goMonth; + resetDay() + continue goMonth } // 如果日期规则中有值时 if (dayRule.value === 'lastDay') { // 如果不是合法日期则需要将前将日期调到合法日期即月末最后一天 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { - DD--; - thisDD = DD < 10 ? '0' + DD : DD; + DD-- + thisDD = DD < 10 ? '0' + DD : DD } } } else if (dayRule.value === 'workDay') { // 校验并调整如果是2月30号这种日期传进来时需调整至正常月底 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { - DD--; - thisDD = DD < 10 ? '0' + DD : DD; + DD-- + thisDD = DD < 10 ? '0' + DD : DD } } // 获取达到条件的日期是星期X - let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); + let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week') // 当星期日时 if (thisWeek === 1) { // 先找下一个日，并判断是否为月底 - DD++; - thisDD = DD < 10 ? '0' + DD : DD; + DD++ + thisDD = DD < 10 ? '0' + DD : DD // 判断下一日已经不是合法日期 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { - DD -= 3; + DD -= 3 } } else if (thisWeek === 7) { // 当星期6时只需判断不是1号就可进行操作 if (dayRuleSup.value !== 1) { - DD--; + DD-- } else { - DD += 2; + DD += 2 } } } else if (dayRule.value === 'weekDay') { // 如果指定了是星期几 // 获取当前日期是属于星期几 - let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); + let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week') // 校验当前星期是否在星期池（dayRuleSup）中 if (dayRuleSup.value.indexOf(thisWeek) < 0) { // 如果到达最大值时 if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue; + continue } } else if (dayRule.value === 'assWeek') { // 如果指定了是第几周的星期几 // 获取每月1号是属于星期几 - let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); + let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week') if (dayRuleSup.value[1] >= thisWeek) { - DD = (dayRuleSup.value[0] - 1) * 7 + dayRuleSup.value[1] - thisWeek + 1; + DD = (dayRuleSup.value[0] - 1) * 7 + dayRuleSup.value[1] - thisWeek + 1 } else { - DD = dayRuleSup.value[0] * 7 + dayRuleSup.value[1] - thisWeek + 1; + DD = dayRuleSup.value[0] * 7 + dayRuleSup.value[1] - thisWeek + 1 } } else if (dayRule.value === 'lastWeek') { // 如果指定了每月最后一个星期几 // 校验并调整如果是2月30号这种日期传进来时需调整至正常月底 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { - DD--; - thisDD = DD < 10 ? '0' + DD : DD; + DD-- + thisDD = DD < 10 ? '0' + DD : DD } } // 获取月末最后一天是星期几 - let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); + let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week') // 找到要求中最近的那个星期几 if (dayRuleSup.value < thisWeek) { - DD -= thisWeek - dayRuleSup.value; + DD -= thisWeek - dayRuleSup.value } else if (dayRuleSup.value > thisWeek) { DD -= 7 - (dayRuleSup.value - thisWeek) } } // 判断时间值是否小于10置换成“05”这种格式 - DD = DD < 10 ? '0' + DD : DD; + DD = DD < 10 ? '0' + DD : DD // 循环“时”数组 goHour: for (let hi = hIdx; hi < hDate.length; hi++) { let hh = hDate[hi] < 10 ? '0' + hDate[hi] : hDate[hi] // 如果到达最大值时 if (nMin > mDate[mDate.length - 1]) { - resetMin(); + resetMin() if (hi === hDate.length - 1) { - resetHour(); + resetHour() if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue goDay; + continue goDay } - continue; + continue } // 循环"分"数组 goMin: for (let mi = mIdx; mi < mDate.length; mi++) { - let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi]; + let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi] // 如果到达最大值时 if (nSecond > sDate[sDate.length - 1]) { - resetSecond(); + resetSecond() if (mi === mDate.length - 1) { - resetMin(); + resetMin() if (hi === hDate.length - 1) { - resetHour(); + resetHour() if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue goDay; + continue goDay } - continue goHour; + continue goHour } - continue; + continue } // 循环"秒"数组 goSecond: for (let si = sIdx; si <= sDate.length - 1; si++) { - let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si]; + let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si] // 添加当前时间（时间合法性在日期循环时已经判断） if (MM !== '00' && DD !== '00') { resultArr.push(YY + '-' + MM + '-' + DD + ' ' + hh + ':' + mm + ':' + ss) - nums++; + nums++ } // 如果条数满了就退出循环 - if (nums === 5) break goYear; + if (nums === 5) break goYear // 如果到达最大值时 if (si === sDate.length - 1) { - resetSecond(); + resetSecond() if (mi === mDate.length - 1) { - resetMin(); + resetMin() if (hi === hDate.length - 1) { - resetHour(); + resetHour() if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue goDay; + continue goDay } - continue goHour; + continue goHour } - continue goMin; + continue goMin } } //goSecond } //goMin @@ -318,31 +318,31 @@ function expressionChange() { } // 判断100年内的结果条数 if (resultArr.length === 0) { - resultList.value = ['没有达到条件的结果！']; + resultList.value = ['没有达到条件的结果！'] } else { - resultList.value = resultArr; + resultList.value = resultArr if (resultArr.length !== 5) { resultList.value.push('最近100年内只有上面' + resultArr.length + '条结果！') } } // 计算完成-显示结果 - isShow.value = true; + isShow.value = true } // 用于计算某位数字在数组中的索引 function getIndex(arr, value) { if (value <= arr[0] || value > arr[arr.length - 1]) { - return 0; + return 0 } else { for (let i = 0; i < arr.length - 1; i++) { if (value > arr[i] && value <= arr[i + 1]) { - return i + 1; + return i + 1 } } } } // 获取"年"数组 function getYearArr(rule, year) { - dateArr.value[5] = getOrderArr(year, year + 100); + dateArr.value[5] = getOrderArr(year, year + 100) if (rule !== undefined) { if (rule.indexOf('-') >= 0) { dateArr.value[5] = getCycleArr(rule, year + 100, false) @@ -355,7 +355,7 @@ function getYearArr(rule, year) { } // 获取"月"数组 function getMonthArr(rule) { - dateArr.value[4] = getOrderArr(1, 12); + dateArr.value[4] = getOrderArr(1, 12) if (rule.indexOf('-') >= 0) { dateArr.value[4] = getCycleArr(rule, 12, false) } else if (rule.indexOf('/') >= 0) { @@ -369,58 +369,58 @@ function getWeekArr(rule) { // 只有当日期规则的两个值均为“”时则表达日期是有选项的 if (dayRule.value === '' && dayRuleSup.value === '') { if (rule.indexOf('-') >= 0) { - dayRule.value = 'weekDay'; + dayRule.value = 'weekDay' dayRuleSup.value = getCycleArr(rule, 7, false) } else if (rule.indexOf('#') >= 0) { - dayRule.value = 'assWeek'; - let matchRule = rule.match(/[0-9]{1}/g); - dayRuleSup.value = [Number(matchRule[1]), Number(matchRule[0])]; - dateArr.value[3] = [1]; + dayRule.value = 'assWeek' + let matchRule = rule.match(/[0-9]{1}/g) + dayRuleSup.value = [Number(matchRule[1]), Number(matchRule[0])] + dateArr.value[3] = [1] if (dayRuleSup.value[1] === 7) { - dayRuleSup.value[1] = 0; + dayRuleSup.value[1] = 0 } } else if (rule.indexOf('L') >= 0) { - dayRule.value = 'lastWeek'; - dayRuleSup.value = Number(rule.match(/[0-9]{1,2}/g)[0]); - dateArr.value[3] = [31]; + dayRule.value = 'lastWeek' + dayRuleSup.value = Number(rule.match(/[0-9]{1,2}/g)[0]) + dateArr.value[3] = [31] if (dayRuleSup.value === 7) { - dayRuleSup.value = 0; + dayRuleSup.value = 0 } } else if (rule !== '*' && rule !== '?') { - dayRule.value = 'weekDay'; + dayRule.value = 'weekDay' dayRuleSup.value = getAssignArr(rule) } } } // 获取"日"数组-少量为日期规则 function getDayArr(rule) { - dateArr.value[3] = getOrderArr(1, 31); - dayRule.value = ''; - dayRuleSup.value = ''; + dateArr.value[3] = getOrderArr(1, 31) + dayRule.value = '' + dayRuleSup.value = '' if (rule.indexOf('-') >= 0) { dateArr.value[3] = getCycleArr(rule, 31, false) - dayRuleSup.value = 'null'; + dayRuleSup.value = 'null' } else if (rule.indexOf('/') >= 0) { dateArr.value[3] = getAverageArr(rule, 31) - dayRuleSup.value = 'null'; + dayRuleSup.value = 'null' } else if (rule.indexOf('W') >= 0) { - dayRule.value = 'workDay'; - dayRuleSup.value = Number(rule.match(/[0-9]{1,2}/g)[0]); - dateArr.value[3] = [dayRuleSup.value]; + dayRule.value = 'workDay' + dayRuleSup.value = Number(rule.match(/[0-9]{1,2}/g)[0]) + dateArr.value[3] = [dayRuleSup.value] } else if (rule.indexOf('L') >= 0) { - dayRule.value = 'lastDay'; - dayRuleSup.value = 'null'; - dateArr.value[3] = [31]; + dayRule.value = 'lastDay' + dayRuleSup.value = 'null' + dateArr.value[3] = [31] } else if (rule !== '*' && rule !== '?') { dateArr.value[3] = getAssignArr(rule) - dayRuleSup.value = 'null'; + dayRuleSup.value = 'null' } else if (rule === '*') { - dayRuleSup.value = 'null'; + dayRuleSup.value = 'null' } } // 获取"时"数组 function getHourArr(rule) { - dateArr.value[2] = getOrderArr(0, 23); + dateArr.value[2] = getOrderArr(0, 23) if (rule.indexOf('-') >= 0) { dateArr.value[2] = getCycleArr(rule, 24, true) } else if (rule.indexOf('/') >= 0) { @@ -431,7 +431,7 @@ function getHourArr(rule) { } // 获取"分"数组 function getMinArr(rule) { - dateArr.value[1] = getOrderArr(0, 59); + dateArr.value[1] = getOrderArr(0, 59) if (rule.indexOf('-') >= 0) { dateArr.value[1] = getCycleArr(rule, 60, true) } else if (rule.indexOf('/') >= 0) { @@ -442,7 +442,7 @@ function getMinArr(rule) { } // 获取"秒"数组 function getSecondArr(rule) { - dateArr.value[0] = getOrderArr(0, 59); + dateArr.value[0] = getOrderArr(0, 59) if (rule.indexOf('-') >= 0) { dateArr.value[0] = getCycleArr(rule, 60, true) } else if (rule.indexOf('/') >= 0) { @@ -453,86 +453,86 @@ function getSecondArr(rule) { } // 根据传进来的min-max返回一个顺序的数组 function getOrderArr(min, max) { - let arr = []; + let arr = [] for (let i = min; i <= max; i++) { - arr.push(i); + arr.push(i) } - return arr; + return arr } // 根据规则中指定的零散值返回一个数组 function getAssignArr(rule) { - let arr = []; - let assiginArr = rule.split(','); + let arr = [] + let assiginArr = rule.split(',') for (let i = 0; i < assiginArr.length; i++) { arr[i] = Number(assiginArr[i]) } arr.sort(compare) - return arr; + return arr } // 根据一定算术规则计算返回一个数组 function getAverageArr(rule, limit) { - let arr = []; - let agArr = rule.split('/'); - let min = Number(agArr[0]); - let step = Number(agArr[1]); + let arr = [] + let agArr = rule.split('/') + let min = Number(agArr[0]) + let step = Number(agArr[1]) while (min <= limit) { - arr.push(min); - min += step; + arr.push(min) + min += step } - return arr; + return arr } // 根据规则返回一个具有周期性的数组 function getCycleArr(rule, limit, status) { // status--表示是否从0开始（则从1开始） - let arr = []; - let cycleArr = rule.split('-'); - let min = Number(cycleArr[0]); - let max = Number(cycleArr[1]); + let arr = [] + let cycleArr = rule.split('-') + let min = Number(cycleArr[0]) + let max = Number(cycleArr[1]) if (min > max) { - max += limit; + max += limit } for (let i = min; i <= max; i++) { - let add = 0; + let add = 0 if (status === false && i % limit === 0) { - add = limit; + add = limit } arr.push(Math.round(i % limit + add)) } arr.sort(compare) - return arr; + return arr } // 比较数字大小（用于Array.sort） function compare(value1, value2) { if (value2 - value1 > 0) { - return -1; + return -1 } else { - return 1; + return 1 } } // 格式化日期格式如：2017-9-19 18:04:33 function formatDate(value, type) { // 计算日期相关值 - let time = typeof value == 'number' ? new Date(value) : value; - let Y = time.getFullYear(); - let M = time.getMonth() + 1; - let D = time.getDate(); - let h = time.getHours(); - let m = time.getMinutes(); - let s = time.getSeconds(); - let week = time.getDay(); + let time = typeof value == 'number' ? new Date(value) : value + let Y = time.getFullYear() + let M = time.getMonth() + 1 + let D = time.getDate() + let h = time.getHours() + let m = time.getMinutes() + let s = time.getSeconds() + let week = time.getDay() // 如果传递了type的话 if (type === undefined) { - return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s); + return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s) } else if (type === 'week') { // 在quartz中 1为星期日 - return week + 1; + return week + 1 } } // 检查日期是否存在 function checkDate(value) { - let time = new Date(value); + let time = new Date(value) let format = formatDate(time) - return value === format; + return value === format } onMounted(() => { expressionChange() diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue index fa921ae..14758ba 100644 --- a/src/components/Crontab/year.vue +++ b/src/components/Crontab/year.vue @@ -61,22 +61,24 @@ const props = defineProps({ } } }) -const fullYear = ref(0) -const maxFullYear = ref(0) + +const fullYear = Number(new Date().getFullYear()) +const maxFullYear = fullYear + 10 const radioValue = ref(1) -const cycle01 = ref(0) -const cycle02 = ref(0) -const average01 = ref(0) +const cycle01 = ref(fullYear) +const cycle02 = ref(fullYear + 1) +const average01 = ref(fullYear) const average02 = ref(1) const checkboxList = ref([]) -const checkCopy = ref([]) +const checkCopy = ref([fullYear]) + const cycleTotal = computed(() => { - cycle01.value = props.check(cycle01.value, fullYear.value, maxFullYear.value - 1) - cycle02.value = props.check(cycle02.value, cycle01.value + 1, maxFullYear.value) + cycle01.value = props.check(cycle01.value, fullYear, maxFullYear - 1) + cycle02.value = props.check(cycle02.value, cycle01.value + 1, maxFullYear) return cycle01.value + '-' + cycle02.value }) const averageTotal = computed(() => { - average01.value = props.check(average01.value, fullYear.value, maxFullYear.value - 1) + average01.value = props.check(average01.value, fullYear, maxFullYear - 1) average02.value = props.check(average02.value, 1, 10) return average01.value + '/' + average02.value }) @@ -97,8 +99,8 @@ function changeRadioValue(value) { radioValue.value = 3 } else if (value.indexOf("/") > -1) { const indexArr = value.split('/') - average01.value = Number(indexArr[1]) - average02.value = Number(indexArr[0]) + average01.value = Number(indexArr[0]) + average02.value = Number(indexArr[1]) radioValue.value = 4 } else { checkboxList.value = [...new Set(value.split(',').map(item => Number(item)))] @@ -129,14 +131,6 @@ function onRadioChange() { break } } -onMounted(() => { - fullYear.value = Number(new Date().getFullYear()) - maxFullYear.value = fullYear.value + 10 - cycle01.value = fullYear.value - cycle02.value = cycle01.value + 1 - average01.value = fullYear.value - checkCopy.value = [fullYear.value] -})