欧阳子桐 / RuoYi · 提交

转到一个项目

作者 fuzui
提交 ca285f5e53aea0dae4fb1db8e46a0c0cb70afa29 1 个父辈 34f2552c

fix: crontab组件周显示及计算bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 69 行增加 和 26 行删除
@@ -179,7 +179,7 @@ export default { @@ -179,7 +179,7 @@ export default {
179 // 获取达到条件的日期是星期X 179 // 获取达到条件的日期是星期X
180 let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); 180 let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
181 // 当星期日时 181 // 当星期日时
182 - if (thisWeek == 0) { 182 + if (thisWeek == 1) {
183 // 先找下一个日，并判断是否为月底 183 // 先找下一个日，并判断是否为月底
184 DD++; 184 DD++;
185 thisDD = DD < 10 ? '0' + DD : DD; 185 thisDD = DD < 10 ? '0' + DD : DD;
@@ -187,7 +187,7 @@ export default { @@ -187,7 +187,7 @@ export default {
187 if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { 187 if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
188 DD -= 3; 188 DD -= 3;
189 } 189 }
190 - } else if (thisWeek == 6) { 190 + } else if (thisWeek == 7) {
191 // 当星期6时只需判断不是1号就可进行操作 191 // 当星期6时只需判断不是1号就可进行操作
192 if (this.dayRuleSup !== 1) { 192 if (this.dayRuleSup !== 1) {
193 DD--; 193 DD--;
@@ -200,7 +200,7 @@ export default { @@ -200,7 +200,7 @@ export default {
200 // 获取当前日期是属于星期几 200 // 获取当前日期是属于星期几
201 let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); 201 let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
202 // 校验当前星期是否在星期池（dayRuleSup）中 202 // 校验当前星期是否在星期池（dayRuleSup）中
203 - if (Array.indexOf(this.dayRuleSup, thisWeek) < 0) { 203 + if (this.dayRuleSup.indexOf(thisWeek) < 0) {
204 // 如果到达最大值时 204 // 如果到达最大值时
205 if (Di == DDate.length - 1) { 205 if (Di == DDate.length - 1) {
206 resetDay(); 206 resetDay();
@@ -385,7 +385,7 @@ export default { @@ -385,7 +385,7 @@ export default {
385 } else if (rule.indexOf('#') >= 0) { 385 } else if (rule.indexOf('#') >= 0) {
386 this.dayRule = 'assWeek'; 386 this.dayRule = 'assWeek';
387 let matchRule = rule.match(/[0-9]{1}/g); 387 let matchRule = rule.match(/[0-9]{1}/g);
388 - this.dayRuleSup = [Number(matchRule[0]), Number(matchRule[1])]; 388 + this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])];
389 this.dateArr[3] = [1]; 389 this.dateArr[3] = [1];
390 if (this.dayRuleSup[1] == 7) { 390 if (this.dayRuleSup[1] == 7) {
391 this.dayRuleSup[1] = 0; 391 this.dayRuleSup[1] = 0;
@@ -401,14 +401,6 @@ export default { @@ -401,14 +401,6 @@ export default {
401 this.dayRule = 'weekDay'; 401 this.dayRule = 'weekDay';
402 this.dayRuleSup = this.getAssignArr(rule) 402 this.dayRuleSup = this.getAssignArr(rule)
403 } 403 }
404 - // 如果weekDay时将7调整为0【week值0即是星期日】  
405 - if (this.dayRule == 'weekDay') {  
406 - for (let i = 0; i < this.dayRuleSup.length; i++) {  
407 - if (this.dayRuleSup[i] == 7) {  
408 - this.dayRuleSup[i] = 0;  
409 - }  
410 - }  
411 - }  
412 } 404 }
413 }, 405 },
414 // 获取"日"数组-少量为日期规则 406 // 获取"日"数组-少量为日期规则
@@ -543,14 +535,15 @@ export default { @@ -543,14 +535,15 @@ export default {
543 if (type == undefined) { 535 if (type == undefined) {
544 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); 536 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);
545 } else if (type == 'week') { 537 } else if (type == 'week') {
546 - return week; 538 + // 在quartz中 1为星期日
  539 + return week + 1;
547 } 540 }
548 }, 541 },
549 // 检查日期是否存在 542 // 检查日期是否存在
550 checkDate(value) { 543 checkDate(value) {
551 let time = new Date(value); 544 let time = new Date(value);
552 let format = this.formatDate(time) 545 let format = this.formatDate(time)
553 - return value == format ? true : false; 546 + return value === format;
554 } 547 }
555 }, 548 },
556 watch: { 549 watch: {
@@ -15,8 +15,25 @@ @@ -15,8 +15,25 @@
15 <el-form-item> 15 <el-form-item>
16 <el-radio v-model='radioValue' :label="3"> 16 <el-radio v-model='radioValue' :label="3">
17 周期从星期 17 周期从星期
18 - <el-input-number v-model='cycle01' :min="1" :max="7" /> -  
19 - <el-input-number v-model='cycle02' :min="1" :max="7" /> 18 + <el-select clearable v-model="cycle01">
  19 + <el-option
  20 + v-for="(item,index) of weekList"
  21 + :key="index"
  22 + :label="item.value"
  23 + :value="item.key"
  24 + :disabled="item.key === 1"
  25 + >{{item.value}}</el-option>
  26 + </el-select>
  27 + -
  28 + <el-select clearable v-model="cycle02">
  29 + <el-option
  30 + v-for="(item,index) of weekList"
  31 + :key="index"
  32 + :label="item.value"
  33 + :value="item.key"
  34 + :disabled="item.key < cycle01 && item.key !== 1"
  35 + >{{item.value}}</el-option>
  36 + </el-select>
20 </el-radio> 37 </el-radio>
21 </el-form-item> 38 </el-form-item>
22 39
@@ -24,14 +41,18 @@ @@ -24,14 +41,18 @@
24 <el-radio v-model='radioValue' :label="4"> 41 <el-radio v-model='radioValue' :label="4">
25 第 42 第
26 <el-input-number v-model='average01' :min="1" :max="4" /> 周的星期 43 <el-input-number v-model='average01' :min="1" :max="4" /> 周的星期
27 - <el-input-number v-model='average02' :min="1" :max="7" /> 44 + <el-select clearable v-model="average02">
  45 + <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
  46 + </el-select>
28 </el-radio> 47 </el-radio>
29 </el-form-item> 48 </el-form-item>
30 49
31 <el-form-item> 50 <el-form-item>
32 <el-radio v-model='radioValue' :label="5"> 51 <el-radio v-model='radioValue' :label="5">
33 本月最后一个星期 52 本月最后一个星期
34 - <el-input-number v-model='weekday' :min="1" :max="7" /> 53 + <el-select clearable v-model="weekday">
  54 + <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
  55 + </el-select>
35 </el-radio> 56 </el-radio>
36 </el-form-item> 57 </el-form-item>
37 58
@@ -39,7 +60,7 @@ @@ -39,7 +60,7 @@
39 <el-radio v-model='radioValue' :label="6"> 60 <el-radio v-model='radioValue' :label="6">
40 指定 61 指定
41 <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"> 62 <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
42 - <el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{item}}</el-option> 63 + <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
43 </el-select> 64 </el-select>
44 </el-radio> 65 </el-radio>
45 </el-form-item> 66 </el-form-item>
@@ -52,13 +73,42 @@ export default { @@ -52,13 +73,42 @@ export default {
52 data() { 73 data() {
53 return { 74 return {
54 radioValue: 2, 75 radioValue: 2,
55 - weekday: 1,  
56 - cycle01: 1,  
57 - cycle02: 2, 76 + weekday: 2,
  77 + cycle01: 2,
  78 + cycle02: 3,
58 average01: 1, 79 average01: 1,
59 - average02: 1, 80 + average02: 2,
60 checkboxList: [], 81 checkboxList: [],
61 - weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'], 82 + weekList: [
  83 + {
  84 + key: 2,
  85 + value: '星期一'
  86 + },
  87 + {
  88 + key: 3,
  89 + value: '星期二'
  90 + },
  91 + {
  92 + key: 4,
  93 + value: '星期三'
  94 + },
  95 + {
  96 + key: 5,
  97 + value: '星期四'
  98 + },
  99 + {
  100 + key: 6,
  101 + value: '星期五'
  102 + },
  103 + {
  104 + key: 7,
  105 + value: '星期六'
  106 + },
  107 + {
  108 + key: 1,
  109 + value: '星期日'
  110 + }
  111 + ],
62 checkNum: this.$options.propsData.check 112 checkNum: this.$options.propsData.check
63 } 113 }
64 }, 114 },
@@ -81,7 +131,7 @@ export default { @@ -81,7 +131,7 @@ export default {
81 this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02); 131 this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
82 break; 132 break;
83 case 4: 133 case 4:
84 - this.$emit('update', 'week', this.average01 + '#' + this.average02); 134 + this.$emit('update', 'week', this.average02 + '#' + this.average01);
85 break; 135 break;
86 case 5: 136 case 5:
87 this.$emit('update', 'week', this.weekday + 'L'); 137 this.$emit('update', 'week', this.weekday + 'L');
@@ -135,7 +185,7 @@ export default { @@ -135,7 +185,7 @@ export default {
135 averageTotal: function () { 185 averageTotal: function () {
136 this.average01 = this.checkNum(this.average01, 1, 4) 186 this.average01 = this.checkNum(this.average01, 1, 4)
137 this.average02 = this.checkNum(this.average02, 1, 7) 187 this.average02 = this.checkNum(this.average02, 1, 7)
138 - return this.average01 + '#' + this.average02; 188 + return this.average02 + '#' + this.average01;
139 }, 189 },
140 // 最近的工作日（格式） 190 // 最近的工作日（格式）
141 weekdayCheck: function () { 191 weekdayCheck: function () {