panqihua
/
ttsbg-java-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!309 修正单词拼写错误

Browse Source 
Merge pull request !309 from 稚屿/master
master
若依 3 years ago committed by Gitee
parent 0e6150720c b35f708c07
commit 4988b585f8
7 changed files with 1742 additions and 1742 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      ruoyi-ui/src/components/Crontab/day.vue
  2. 134
      ruoyi-ui/src/components/Crontab/index.vue
  3. 24
      ruoyi-ui/src/components/Crontab/month.vue
  4. 48
      ruoyi-ui/src/components/Crontab/result.vue
  5. 4
      ruoyi-ui/src/components/Crontab/week.vue
  6. 6
      ruoyi-ui/src/components/Crontab/year.vue

2
ruoyi-ui/src/components/Crontab/day.vue
Unescape View File

@ -75,7 +75,7 @@ export default {
if (this.radioValue === 1) { if (this.radioValue === 1) {
this.$emit('update', 'day', '*', 'day'); this.$emit('update', 'day', '*', 'day');
this.$emit('update', 'week', '?', 'day'); this.$emit('update', 'week', '?', 'day');
this.$emit('update', 'mouth', '*', 'day'); this.$emit('update', 'month', '*', 'day');
} else { } else {
if (this.cron.hour === '*') { if (this.cron.hour === '*') {
this.$emit('update', 'hour', '0', 'day'); this.$emit('update', 'hour', '0', 'day');

134
ruoyi-ui/src/components/Crontab/index.vue
Unescape View File

@ -2,59 +2,59 @@
<div> <div>
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="秒" v-if="shouldHide('second')"> <el-tab-pane label="秒" v-if="shouldHide('second')">
<CrontabSecond @update="updateContabValue" :check="checkNumber" ref="cronsecond" /> <CrontabSecond @update="updateCrontabValue" :check="checkNumber" ref="cronsecond" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="分钟" v-if="shouldHide('min')"> <el-tab-pane label="分钟" v-if="shouldHide('min')">
<CrontabMin <CrontabMin
@update="updateContabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="contabValueObj" :cron="crontabValueObj"
ref="cronmin" ref="cronmin"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="小时" v-if="shouldHide('hour')"> <el-tab-pane label="小时" v-if="shouldHide('hour')">
<CrontabHour <CrontabHour
@update="updateContabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="contabValueObj" :cron="crontabValueObj"
ref="cronhour" ref="cronhour"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="日" v-if="shouldHide('day')"> <el-tab-pane label="日" v-if="shouldHide('day')">
<CrontabDay <CrontabDay
@update="updateContabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="contabValueObj" :cron="crontabValueObj"
ref="cronday" ref="cronday"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="月" v-if="shouldHide('mouth')"> <el-tab-pane label="月" v-if="shouldHide('month')">
<CrontabMouth <CrontabMonth
@update="updateContabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="contabValueObj" :cron="crontabValueObj"
ref="cronmouth" ref="cronmonth"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="周" v-if="shouldHide('week')"> <el-tab-pane label="周" v-if="shouldHide('week')">
<CrontabWeek <CrontabWeek
@update="updateContabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="contabValueObj" :cron="crontabValueObj"
ref="cronweek" ref="cronweek"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="年" v-if="shouldHide('year')"> <el-tab-pane label="年" v-if="shouldHide('year')">
<CrontabYear <CrontabYear
@update="updateContabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="contabValueObj" :cron="crontabValueObj"
ref="cronyear" ref="cronyear"
/> />
</el-tab-pane> </el-tab-pane>
@ -70,33 +70,33 @@
</thead> </thead>
<tbody> <tbody>
<td> <td>
<span>{{contabValueObj.second}}</span> <span>{{crontabValueObj.second}}</span>
</td> </td>
<td> <td>
<span>{{contabValueObj.min}}</span> <span>{{crontabValueObj.min}}</span>
</td> </td>
<td> <td>
<span>{{contabValueObj.hour}}</span> <span>{{crontabValueObj.hour}}</span>
</td> </td>
<td> <td>
<span>{{contabValueObj.day}}</span> <span>{{crontabValueObj.day}}</span>
</td> </td>
<td> <td>
<span>{{contabValueObj.mouth}}</span> <span>{{crontabValueObj.month}}</span>
</td> </td>
<td> <td>
<span>{{contabValueObj.week}}</span> <span>{{crontabValueObj.week}}</span>
</td> </td>
<td> <td>
<span>{{contabValueObj.year}}</span> <span>{{crontabValueObj.year}}</span>
</td> </td>
<td> <td>
<span>{{contabValueString}}</span> <span>{{crontabValueString}}</span>
</td> </td>
</tbody> </tbody>
</table> </table>
</div> </div>
<CrontabResult :ex="contabValueString"></CrontabResult> <CrontabResult :ex="crontabValueString"></CrontabResult>
<div class="pop_btn"> <div class="pop_btn">
<el-button size="small" type="primary" @click="submitFill">确定</el-button> <el-button size="small" type="primary" @click="submitFill">确定</el-button>
@ -112,7 +112,7 @@ import CrontabSecond from "./second.vue";
import CrontabMin from "./min.vue"; import CrontabMin from "./min.vue";
import CrontabHour from "./hour.vue"; import CrontabHour from "./hour.vue";
import CrontabDay from "./day.vue"; import CrontabDay from "./day.vue";
import CrontabMouth from "./mouth.vue"; import CrontabMonth from "./month.vue";
import CrontabWeek from "./week.vue"; import CrontabWeek from "./week.vue";
import CrontabYear from "./year.vue"; import CrontabYear from "./year.vue";
import CrontabResult from "./result.vue"; import CrontabResult from "./result.vue";
@ -123,12 +123,12 @@ export default {
tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"], tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],
tabActive: 0, tabActive: 0,
myindex: 0, myindex: 0,
contabValueObj: { crontabValueObj: {
second: "*", second: "*",
min: "*", min: "*",
hour: "*", hour: "*",
day: "*", day: "*",
mouth: "*", month: "*",
week: "?", week: "?",
year: "", year: "",
}, },
@ -152,11 +152,11 @@ export default {
min: arr[1], min: arr[1],
hour: arr[2], hour: arr[2],
day: arr[3], day: arr[3],
mouth: arr[4], month: arr[4],
week: arr[5], week: arr[5],
year: arr[6] ? arr[6] : "", year: arr[6] ? arr[6] : "",
}; };
this.contabValueObj = { this.crontabValueObj = {
...obj, ...obj,
}; };
for (let i in obj) { for (let i in obj) {
@ -173,9 +173,9 @@ export default {
this.tabActive = index; this.tabActive = index;
}, },
// 由子组件触发，更改表达式组成的字段值 // 由子组件触发，更改表达式组成的字段值
updateContabValue(name, value, from) { updateCrontabValue(name, value, from) {
"updateContabValue", name, value, from; "updateCrontabValue", name, value, from;
this.contabValueObj[name] = value; this.crontabValueObj[name] = value;
if (from && from !== name) { if (from && from !== name) {
console.log(`来自组件 ${from} 改变了 ${name} ${value}`); console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
this.changeRadio(name, value); this.changeRadio(name, value);
@ -183,108 +183,108 @@ export default {
}, },
// 赋值到组件 // 赋值到组件
changeRadio(name, value) { changeRadio(name, value) {
let arr = ["second", "min", "hour", "mouth"], let arr = ["second", "min", "hour", "month"],
refName = "cron" + name, refName = "cron" + name,
insVlaue; insValue;
if (!this.$refs[refName]) return; if (!this.$refs[refName]) return;
if (arr.includes(name)) { if (arr.includes(name)) {
if (value === "*") { if (value === "*") {
insVlaue = 1; insValue = 1;
} else if (value.indexOf("-") > -1) { } else if (value.indexOf("-") > -1) {
let indexArr = value.split("-"); let indexArr = value.split("-");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0) ? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]); : (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1]; this.$refs[refName].cycle02 = indexArr[1];
insVlaue = 2; insValue = 2;
} else if (value.indexOf("/") > -1) { } else if (value.indexOf("/") > -1) {
let indexArr = value.split("/"); let indexArr = value.split("/");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].average01 = 0) ? (this.$refs[refName].average01 = 0)
: (this.$refs[refName].average01 = indexArr[0]); : (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1]; this.$refs[refName].average02 = indexArr[1];
insVlaue = 3; insValue = 3;
} else { } else {
insVlaue = 4; insValue = 4;
this.$refs[refName].checkboxList = value.split(","); this.$refs[refName].checkboxList = value.split(",");
} }
} else if (name == "day") { } else if (name == "day") {
if (value === "*") { if (value === "*") {
insVlaue = 1; insValue = 1;
} else if (value == "?") { } else if (value == "?") {
insVlaue = 2; insValue = 2;
} else if (value.indexOf("-") > -1) { } else if (value.indexOf("-") > -1) {
let indexArr = value.split("-"); let indexArr = value.split("-");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0) ? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]); : (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1]; this.$refs[refName].cycle02 = indexArr[1];
insVlaue = 3; insValue = 3;
} else if (value.indexOf("/") > -1) { } else if (value.indexOf("/") > -1) {
let indexArr = value.split("/"); let indexArr = value.split("/");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].average01 = 0) ? (this.$refs[refName].average01 = 0)
: (this.$refs[refName].average01 = indexArr[0]); : (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1]; this.$refs[refName].average02 = indexArr[1];
insVlaue = 4; insValue = 4;
} else if (value.indexOf("W") > -1) { } else if (value.indexOf("W") > -1) {
let indexArr = value.split("W"); let indexArr = value.split("W");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].workday = 0) ? (this.$refs[refName].workday = 0)
: (this.$refs[refName].workday = indexArr[0]); : (this.$refs[refName].workday = indexArr[0]);
insVlaue = 5; insValue = 5;
} else if (value === "L") { } else if (value === "L") {
insVlaue = 6; insValue = 6;
} else { } else {
this.$refs[refName].checkboxList = value.split(","); this.$refs[refName].checkboxList = value.split(",");
insVlaue = 7; insValue = 7;
} }
} else if (name == "week") { } else if (name == "week") {
if (value === "*") { if (value === "*") {
insVlaue = 1; insValue = 1;
} else if (value == "?") { } else if (value == "?") {
insVlaue = 2; insValue = 2;
} else if (value.indexOf("-") > -1) { } else if (value.indexOf("-") > -1) {
let indexArr = value.split("-"); let indexArr = value.split("-");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0) ? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]); : (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1]; this.$refs[refName].cycle02 = indexArr[1];
insVlaue = 3; insValue = 3;
} else if (value.indexOf("#") > -1) { } else if (value.indexOf("#") > -1) {
let indexArr = value.split("#"); let indexArr = value.split("#");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].average01 = 1) ? (this.$refs[refName].average01 = 1)
: (this.$refs[refName].average01 = indexArr[0]); : (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1]; this.$refs[refName].average02 = indexArr[1];
insVlaue = 4; insValue = 4;
} else if (value.indexOf("L") > -1) { } else if (value.indexOf("L") > -1) {
let indexArr = value.split("L"); let indexArr = value.split("L");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].weekday = 1) ? (this.$refs[refName].weekday = 1)
: (this.$refs[refName].weekday = indexArr[0]); : (this.$refs[refName].weekday = indexArr[0]);
insVlaue = 5; insValue = 5;
} else { } else {
this.$refs[refName].checkboxList = value.split(","); this.$refs[refName].checkboxList = value.split(",");
insVlaue = 7; insValue = 7;
} }
} else if (name == "year") { } else if (name == "year") {
if (value == "") { if (value == "") {
insVlaue = 1; insValue = 1;
} else if (value == "*") { } else if (value == "*") {
insVlaue = 2; insValue = 2;
} else if (value.indexOf("-") > -1) { } else if (value.indexOf("-") > -1) {
insVlaue = 3; insValue = 3;
} else if (value.indexOf("/") > -1) { } else if (value.indexOf("/") > -1) {
insVlaue = 4; insValue = 4;
} else { } else {
this.$refs[refName].checkboxList = value.split(","); this.$refs[refName].checkboxList = value.split(",");
insVlaue = 5; insValue = 5;
} }
} }
this.$refs[refName].radioValue = insVlaue; this.$refs[refName].radioValue = insValue;
}, },
// 表单选项的子组件校验数字格式（通过-props传递） // 表单选项的子组件校验数字格式（通过-props传递）
checkNumber(value, minLimit, maxLimit) { checkNumber(value, minLimit, maxLimit) {
@ -303,29 +303,29 @@ export default {
}, },
// 填充表达式 // 填充表达式
submitFill() { submitFill() {
this.$emit("fill", this.contabValueString); this.$emit("fill", this.crontabValueString);
this.hidePopup(); this.hidePopup();
}, },
clearCron() { clearCron() {
// 还原选择项 // 还原选择项
("准备还原"); ("准备还原");
this.contabValueObj = { this.crontabValueObj = {
second: "*", second: "*",
min: "*", min: "*",
hour: "*", hour: "*",
day: "*", day: "*",
mouth: "*", month: "*",
week: "?", week: "?",
year: "", year: "",
}; };
for (let j in this.contabValueObj) { for (let j in this.crontabValueObj) {
this.changeRadio(j, this.contabValueObj[j]); this.changeRadio(j, this.crontabValueObj[j]);
} }
}, },
}, },
computed: { computed: {
contabValueString: function() { crontabValueString: function() {
let obj = this.contabValueObj; let obj = this.crontabValueObj;
let str = let str =
obj.second + obj.second +
" " + " " +
@ -335,7 +335,7 @@ export default {
" " + " " +
obj.day + obj.day +
" " + " " +
obj.mouth + obj.month +
" " + " " +
obj.week + obj.week +
(obj.year == "" ? "" : " " + obj.year); (obj.year == "" ? "" : " " + obj.year);
@ -347,7 +347,7 @@ export default {
CrontabMin, CrontabMin,
CrontabHour, CrontabHour,
CrontabDay, CrontabDay,
CrontabMouth, CrontabMonth,
CrontabWeek, CrontabWeek,
CrontabYear, CrontabYear,
CrontabResult, CrontabResult,

24
ruoyi-ui/src/components/Crontab/mouth.vue → ruoyi-ui/src/components/Crontab/month.vue
Unescape View File

@ -46,56 +46,56 @@ export default {
checkNum: this.check checkNum: this.check
} }
}, },
name: 'crontab-mouth', name: 'crontab-month',
props: ['check', 'cron'], props: ['check', 'cron'],
methods: { methods: {
// 单选按钮值变化时 // 单选按钮值变化时
radioChange() { radioChange() {
if (this.radioValue === 1) { if (this.radioValue === 1) {
this.$emit('update', 'mouth', '*'); this.$emit('update', 'month', '*');
this.$emit('update', 'year', '*'); this.$emit('update', 'year', '*');
} else { } else {
if (this.cron.day === '*') { if (this.cron.day === '*') {
this.$emit('update', 'day', '0', 'mouth'); this.$emit('update', 'day', '0', 'month');
} }
if (this.cron.hour === '*') { if (this.cron.hour === '*') {
this.$emit('update', 'hour', '0', 'mouth'); this.$emit('update', 'hour', '0', 'month');
} }
if (this.cron.min === '*') { if (this.cron.min === '*') {
this.$emit('update', 'min', '0', 'mouth'); this.$emit('update', 'min', '0', 'month');
} }
if (this.cron.second === '*') { if (this.cron.second === '*') {
this.$emit('update', 'second', '0', 'mouth'); this.$emit('update', 'second', '0', 'month');
} }
} }
switch (this.radioValue) { switch (this.radioValue) {
case 2: case 2:
this.$emit('update', 'mouth', this.cycle01 + '-' + this.cycle02); this.$emit('update', 'month', this.cycle01 + '-' + this.cycle02);
break; break;
case 3: case 3:
this.$emit('update', 'mouth', this.average01 + '/' + this.average02); this.$emit('update', 'month', this.average01 + '/' + this.average02);
break; break;
case 4: case 4:
this.$emit('update', 'mouth', this.checkboxString); this.$emit('update', 'month', this.checkboxString);
break; break;
} }
}, },
// 周期两个值变化时 // 周期两个值变化时
cycleChange() { cycleChange() {
if (this.radioValue == '2') { if (this.radioValue == '2') {
this.$emit('update', 'mouth', this.cycleTotal); this.$emit('update', 'month', this.cycleTotal);
} }
}, },
// 平均两个值变化时 // 平均两个值变化时
averageChange() { averageChange() {
if (this.radioValue == '3') { if (this.radioValue == '3') {
this.$emit('update', 'mouth', this.averageTotal); this.$emit('update', 'month', this.averageTotal);
} }
}, },
// checkbox值变化时 // checkbox值变化时
checkboxChange() { checkboxChange() {
if (this.radioValue == '4') { if (this.radioValue == '4') {
this.$emit('update', 'mouth', this.checkboxString); this.$emit('update', 'month', this.checkboxString);
} }
} }
}, },

48
ruoyi-ui/src/components/Crontab/result.vue
Unescape View File

@ -37,7 +37,7 @@ export default {
// 获取当前时间精确至[年、月、日、时、分、秒] // 获取当前时间精确至[年、月、日、时、分、秒]
let nTime = new Date(); let nTime = new Date();
let nYear = nTime.getFullYear(); let nYear = nTime.getFullYear();
let nMouth = nTime.getMonth() + 1; let nMonth = nTime.getMonth() + 1;
let nDay = nTime.getDate(); let nDay = nTime.getDate();
let nHour = nTime.getHours(); let nHour = nTime.getHours();
let nMin = nTime.getMinutes(); let nMin = nTime.getMinutes();
@ -47,7 +47,7 @@ export default {
this.getMinArr(ruleArr[1]); this.getMinArr(ruleArr[1]);
this.getHourArr(ruleArr[2]); this.getHourArr(ruleArr[2]);
this.getDayArr(ruleArr[3]); this.getDayArr(ruleArr[3]);
this.getMouthArr(ruleArr[4]); this.getMonthArr(ruleArr[4]);
this.getWeekArr(ruleArr[5]); this.getWeekArr(ruleArr[5]);
this.getYearArr(ruleArr[6], nYear); this.getYearArr(ruleArr[6], nYear);
// 将获取到的数组赋值-方便使用 // 将获取到的数组赋值-方便使用
@ -62,7 +62,7 @@ export default {
let mIdx = this.getIndex(mDate, nMin); let mIdx = this.getIndex(mDate, nMin);
let hIdx = this.getIndex(hDate, nHour); let hIdx = this.getIndex(hDate, nHour);
let DIdx = this.getIndex(DDate, nDay); let DIdx = this.getIndex(DDate, nDay);
let MIdx = this.getIndex(MDate, nMouth); let MIdx = this.getIndex(MDate, nMonth);
let YIdx = this.getIndex(YDate, nYear); let YIdx = this.getIndex(YDate, nYear);
// 重置月日时分秒的函数(后面用的比较多) // 重置月日时分秒的函数(后面用的比较多)
const resetSecond = function () { const resetSecond = function () {
@ -84,17 +84,17 @@ export default {
nDay = DDate[DIdx] nDay = DDate[DIdx]
resetHour(); resetHour();
} }
const resetMouth = function () { const resetMonth = function () {
MIdx = 0; MIdx = 0;
nMouth = MDate[MIdx] nMonth = MDate[MIdx]
resetDay(); resetDay();
} }
// 如果当前年份不为数组中当前值 // 如果当前年份不为数组中当前值
if (nYear !== YDate[YIdx]) { if (nYear !== YDate[YIdx]) {
resetMouth(); resetMonth();
} }
// 如果当前月份不为数组中当前值 // 如果当前月份不为数组中当前值
if (nMouth !== MDate[MIdx]) { if (nMonth !== MDate[MIdx]) {
resetDay(); resetDay();
} }
// 如果当前“日”不为数组中当前值 // 如果当前“日”不为数组中当前值
@ -114,12 +114,12 @@ export default {
goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) { goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) {
let YY = YDate[Yi]; let YY = YDate[Yi];
// 如果到达最大值时 // 如果到达最大值时
if (nMouth > MDate[MDate.length - 1]) { if (nMonth > MDate[MDate.length - 1]) {
resetMouth(); resetMonth();
continue; continue;
} }
// 循环月份数组 // 循环月份数组
goMouth: for (let Mi = MIdx; Mi < MDate.length; Mi++) { goMonth: for (let Mi = MIdx; Mi < MDate.length; Mi++) {
// 赋值、方便后面运算 // 赋值、方便后面运算
let MM = MDate[Mi]; let MM = MDate[Mi];
MM = MM < 10 ? '0' + MM : MM; MM = MM < 10 ? '0' + MM : MM;
@ -127,7 +127,7 @@ export default {
if (nDay > DDate[DDate.length - 1]) { if (nDay > DDate[DDate.length - 1]) {
resetDay(); resetDay();
if (Mi == MDate.length - 1) { if (Mi == MDate.length - 1) {
resetMouth(); resetMonth();
continue goYear; continue goYear;
} }
continue; continue;
@ -144,10 +144,10 @@ export default {
if (Di == DDate.length - 1) { if (Di == DDate.length - 1) {
resetDay(); resetDay();
if (Mi == MDate.length - 1) { if (Mi == MDate.length - 1) {
resetMouth(); resetMonth();
continue goYear; continue goYear;
} }
continue goMouth; continue goMonth;
} }
continue; continue;
} }
@ -155,7 +155,7 @@ export default {
// 判断日期的合法性，不合法的话也是跳出当前循环 // 判断日期的合法性，不合法的话也是跳出当前循环
if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') { if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') {
resetDay(); resetDay();
continue goMouth; continue goMonth;
} }
// 如果日期规则中有值时 // 如果日期规则中有值时
if (this.dayRule == 'lastDay') { if (this.dayRule == 'lastDay') {
@ -205,10 +205,10 @@ export default {
if (Di == DDate.length - 1) { if (Di == DDate.length - 1) {
resetDay(); resetDay();
if (Mi == MDate.length - 1) { if (Mi == MDate.length - 1) {
resetMouth(); resetMonth();
continue goYear; continue goYear;
} }
continue goMouth; continue goMonth;
} }
continue; continue;
} }
@ -254,10 +254,10 @@ export default {
if (Di == DDate.length - 1) { if (Di == DDate.length - 1) {
resetDay(); resetDay();
if (Mi == MDate.length - 1) { if (Mi == MDate.length - 1) {
resetMouth(); resetMonth();
continue goYear; continue goYear;
} }
continue goMouth; continue goMonth;
} }
continue goDay; continue goDay;
} }
@ -277,10 +277,10 @@ export default {
if (Di == DDate.length - 1) { if (Di == DDate.length - 1) {
resetDay(); resetDay();
if (Mi == MDate.length - 1) { if (Mi == MDate.length - 1) {
resetMouth(); resetMonth();
continue goYear; continue goYear;
} }
continue goMouth; continue goMonth;
} }
continue goDay; continue goDay;
} }
@ -308,10 +308,10 @@ export default {
if (Di == DDate.length - 1) { if (Di == DDate.length - 1) {
resetDay(); resetDay();
if (Mi == MDate.length - 1) { if (Mi == MDate.length - 1) {
resetMouth(); resetMonth();
continue goYear; continue goYear;
} }
continue goMouth; continue goMonth;
} }
continue goDay; continue goDay;
} }
@ -323,7 +323,7 @@ export default {
} //goMin } //goMin
}//goHour }//goHour
}//goDay }//goDay
}//goMouth }//goMonth
} }
// 判断100年内的结果条数 // 判断100年内的结果条数
if (resultArr.length == 0) { if (resultArr.length == 0) {
@ -365,7 +365,7 @@ export default {
} }
}, },
// 获取"月"数组 // 获取"月"数组
getMouthArr(rule) { getMonthArr(rule) {
this.dateArr[4] = this.getOrderArr(1, 12); this.dateArr[4] = this.getOrderArr(1, 12);
if (rule.indexOf('-') >= 0) { if (rule.indexOf('-') >= 0) {
this.dateArr[4] = this.getCycleArr(rule, 12, false) this.dateArr[4] = this.getCycleArr(rule, 12, false)

4
ruoyi-ui/src/components/Crontab/week.vue
Unescape View File

@ -71,8 +71,8 @@ export default {
this.$emit('update', 'week', '*'); this.$emit('update', 'week', '*');
this.$emit('update', 'year', '*'); this.$emit('update', 'year', '*');
} else { } else {
if (this.cron.mouth === '*') { if (this.cron.month === '*') {
this.$emit('update', 'mouth', '0', 'week'); this.$emit('update', 'month', '0', 'week');
} }
if (this.cron.day === '*') { if (this.cron.day === '*') {
this.$emit('update', 'day', '0', 'week'); this.$emit('update', 'day', '0', 'week');

6
ruoyi-ui/src/components/Crontab/year.vue
Unescape View File

@ -55,12 +55,12 @@ export default {
} }
}, },
name: 'crontab-year', name: 'crontab-year',
props: ['check', 'mouth', 'cron'], props: ['check', 'month', 'cron'],
methods: { methods: {
// 单选按钮值变化时 // 单选按钮值变化时
radioChange() { radioChange() {
if (this.cron.mouth === '*') { if (this.cron.month === '*') {
this.$emit('update', 'mouth', '0', 'year'); this.$emit('update', 'month', '0', 'year');
} }
if (this.cron.day === '*') { if (this.cron.day === '*') {
this.$emit('update', 'day', '0', 'year'); this.$emit('update', 'day', '0', 'year');

Write Preview
Loading…
Cancel
Save