diff --git a/ruoyi-ui/src/components/Crontab/day.vue b/ruoyi-ui/src/components/Crontab/day.vue index bf9f5664e..901cef9f9 100644 --- a/ruoyi-ui/src/components/Crontab/day.vue +++ b/ruoyi-ui/src/components/Crontab/day.vue @@ -1,179 +1,184 @@ diff --git a/ruoyi-ui/src/components/Crontab/hour.vue b/ruoyi-ui/src/components/Crontab/hour.vue index 5a1e14678..c4bf01ca2 100644 --- a/ruoyi-ui/src/components/Crontab/hour.vue +++ b/ruoyi-ui/src/components/Crontab/hour.vue @@ -1,122 +1,129 @@ - - - \ No newline at end of file + + + diff --git a/ruoyi-ui/src/components/Crontab/index.vue b/ruoyi-ui/src/components/Crontab/index.vue index 27b4ab36c..5896e9335 100644 --- a/ruoyi-ui/src/components/Crontab/index.vue +++ b/ruoyi-ui/src/components/Crontab/index.vue @@ -1,110 +1,110 @@ diff --git a/ruoyi-ui/src/components/Crontab/min.vue b/ruoyi-ui/src/components/Crontab/min.vue index 980c4e768..55befd0d3 100644 --- a/ruoyi-ui/src/components/Crontab/min.vue +++ b/ruoyi-ui/src/components/Crontab/min.vue @@ -1,120 +1,127 @@ - - - \ No newline at end of file + + + diff --git a/ruoyi-ui/src/components/Crontab/month.vue b/ruoyi-ui/src/components/Crontab/month.vue index 619d1e791..1f5f64110 100644 --- a/ruoyi-ui/src/components/Crontab/month.vue +++ b/ruoyi-ui/src/components/Crontab/month.vue @@ -25,7 +25,7 @@ 指定 - + {{item}} @@ -48,25 +48,20 @@ export default { }, name: 'crontab-month', props: ['check', 'cron'], - methods: { + methods: { selectChange() { + this.radioValue = 4 + }, + init() { + this.cycle01 = 1 + this.cycle02 = 2 + this.average01 = 1 + this.average02 = 1 + this.checkboxList = [] + }, // 单选按钮值变化时 radioChange() { if (this.radioValue === 1) { this.$emit('update', 'month', '*'); - this.$emit('update', 'year', '*'); - } else { - if (this.cron.day === '*') { - this.$emit('update', 'day', '0', 'month'); - } - if (this.cron.hour === '*') { - this.$emit('update', 'hour', '0', 'month'); - } - if (this.cron.min === '*') { - this.$emit('update', 'min', '0', 'month'); - } - if (this.cron.second === '*') { - this.$emit('update', 'second', '0', 'month'); - } } switch (this.radioValue) { case 2: diff --git a/ruoyi-ui/src/components/Crontab/result.vue b/ruoyi-ui/src/components/Crontab/result.vue index 07b963b79..537f34524 100644 --- a/ruoyi-ui/src/components/Crontab/result.vue +++ b/ruoyi-ui/src/components/Crontab/result.vue @@ -3,7 +3,7 @@

最近5次运行时间

@@ -25,7 +25,6 @@ export default { methods: { // 表达式值变化时,开始去计算结果 expressionChange() { - // 计算开始-隐藏结果 this.isShow = false; // 获取规则数组[0秒、1分、2时、3日、4月、5星期、6年] @@ -151,7 +150,6 @@ export default { } continue; } - // 判断日期的合法性,不合法的话也是跳出当前循环 if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') { resetDay(); @@ -160,7 +158,6 @@ export default { // 如果日期规则中有值时 if (this.dayRule == 'lastDay') { // 如果不是合法日期则需要将前将日期调到合法日期即月末最后一天 - if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { DD--; @@ -200,7 +197,7 @@ export default { // 获取当前日期是属于星期几 let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); // 校验当前星期是否在星期池(dayRuleSup)中 - if (Array.indexOf(this.dayRuleSup, thisWeek) < 0) { + if (this.dayRuleSup.indexOf(thisWeek) < 0) { // 如果到达最大值时 if (Di == DDate.length - 1) { resetDay(); @@ -241,11 +238,9 @@ export default { } // 判断时间值是否小于10置换成“05”这种格式 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(); @@ -266,7 +261,6 @@ export default { // 循环"分"数组 goMin: for (let mi = mIdx; mi < mDate.length; mi++) { let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi]; - // 如果到达最大值时 if (nSecond > sDate[sDate.length - 1]) { resetSecond(); diff --git a/ruoyi-ui/src/components/Crontab/second.vue b/ruoyi-ui/src/components/Crontab/second.vue index 0fdf3386d..b001eaeb9 100644 --- a/ruoyi-ui/src/components/Crontab/second.vue +++ b/ruoyi-ui/src/components/Crontab/second.vue @@ -1,133 +1,147 @@ diff --git a/ruoyi-ui/src/components/Crontab/week.vue b/ruoyi-ui/src/components/Crontab/week.vue index 5ad949d6b..377fa4006 100644 --- a/ruoyi-ui/src/components/Crontab/week.vue +++ b/ruoyi-ui/src/components/Crontab/week.vue @@ -1,167 +1,179 @@ diff --git a/ruoyi-ui/src/components/Crontab/year.vue b/ruoyi-ui/src/components/Crontab/year.vue index 800dfa522..fe0216ef5 100644 --- a/ruoyi-ui/src/components/Crontab/year.vue +++ b/ruoyi-ui/src/components/Crontab/year.vue @@ -57,23 +57,16 @@ export default { name: 'crontab-year', props: ['check', 'month', 'cron'], methods: { + init() { + this.fullYear = Number(new Date().getFullYear()) + this.cycle01 = 0 + this.cycle02 = 0 + this.average01 = 0 + this.average02 = 1 + this.checkboxList = [] + }, // 单选按钮值变化时 radioChange() { - if (this.cron.month === '*') { - this.$emit('update', 'month', '0', 'year'); - } - if (this.cron.day === '*') { - this.$emit('update', 'day', '0', 'year'); - } - if (this.cron.hour === '*') { - this.$emit('update', 'hour', '0', 'year'); - } - if (this.cron.min === '*') { - this.$emit('update', 'min', '0', 'year'); - } - if (this.cron.second === '*') { - this.$emit('update', 'second', '0', 'year'); - } switch (this.radioValue) { case 1: this.$emit('update', 'year', ''); diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue index 718723ea4..31b01971f 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/ruoyi-ui/src/layout/index.vue @@ -1,107 +1,108 @@ - - - - - + + + + +