修正单词拼写错误
This commit is contained in:
		
							parent
							
								
									ea20fa3ce2
								
							
						
					
					
						commit
						cd4119b26a
					
				| @ -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'); | ||||||
|  | |||||||
| @ -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: "", | ||||||
|       }, |       }, | ||||||
| @ -142,7 +142,7 @@ export default { | |||||||
|       return true; |       return true; | ||||||
|     }, |     }, | ||||||
|     resolveExp() { |     resolveExp() { | ||||||
|       //反解析 表达式 |       // 反解析 表达式 | ||||||
|       if (this.expression) { |       if (this.expression) { | ||||||
|         let arr = this.expression.split(" "); |         let arr = this.expression.split(" "); | ||||||
|         if (arr.length >= 6) { |         if (arr.length >= 6) { | ||||||
| @ -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) { | ||||||
| @ -164,7 +164,7 @@ export default { | |||||||
|           } |           } | ||||||
|         } |         } | ||||||
|       } else { |       } else { | ||||||
|         //没有传入的表达式 则还原 |         // 没有传入的表达式 则还原 | ||||||
|         this.clearCron(); |         this.clearCron(); | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
| @ -173,122 +173,122 @@ 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); | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     //赋值到组件 |     // 赋值到组件 | ||||||
|     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) { | ||||||
|       //检查必须为整数 |       // 检查必须为整数 | ||||||
|       value = Math.floor(value); |       value = Math.floor(value); | ||||||
|       if (value < minLimit) { |       if (value < minLimit) { | ||||||
|         value = minLimit; |         value = minLimit; | ||||||
| @ -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, | ||||||
|  | |||||||
| @ -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); | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 	}, | 	}, | ||||||
| @ -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,11 +155,11 @@ 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') { | ||||||
| 							//如果不是合法日期则需要将前将日期调到合法日期即月末最后一天 | 							// 如果不是合法日期则需要将前将日期调到合法日期即月末最后一天 | ||||||
| 
 | 
 | ||||||
| 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | ||||||
| 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | ||||||
| @ -169,7 +169,7 @@ export default { | |||||||
| 								} | 								} | ||||||
| 							} | 							} | ||||||
| 						} else if (this.dayRule == 'workDay') { | 						} else if (this.dayRule == 'workDay') { | ||||||
| 							//校验并调整如果是2月30号这种日期传进来时需调整至正常月底 | 							// 校验并调整如果是2月30号这种日期传进来时需调整至正常月底 | ||||||
| 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | ||||||
| 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | ||||||
| 									DD--; | 									DD--; | ||||||
| @ -180,15 +180,15 @@ export default { | |||||||
| 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); | 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); | ||||||
| 							// 当星期日时 | 							// 当星期日时 | ||||||
| 							if (thisWeek == 0) { | 							if (thisWeek == 0) { | ||||||
| 								//先找下一个日,并判断是否为月底 | 								// 先找下一个日,并判断是否为月底 | ||||||
| 								DD++; | 								DD++; | ||||||
| 								thisDD = DD < 10 ? '0' + DD : DD; | 								thisDD = DD < 10 ? '0' + DD : DD; | ||||||
| 								//判断下一日已经不是合法日期 | 								// 判断下一日已经不是合法日期 | ||||||
| 								if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | 								if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | ||||||
| 									DD -= 3; | 									DD -= 3; | ||||||
| 								} | 								} | ||||||
| 							} else if (thisWeek == 6) { | 							} else if (thisWeek == 6) { | ||||||
| 								//当星期6时只需判断不是1号就可进行操作 | 								// 当星期6时只需判断不是1号就可进行操作 | ||||||
| 								if (this.dayRuleSup !== 1) { | 								if (this.dayRuleSup !== 1) { | ||||||
| 									DD--; | 									DD--; | ||||||
| 								} else { | 								} else { | ||||||
| @ -196,25 +196,25 @@ export default { | |||||||
| 								} | 								} | ||||||
| 							} | 							} | ||||||
| 						} else if (this.dayRule == 'weekDay') { | 						} else if (this.dayRule == 'weekDay') { | ||||||
| 							//如果指定了是星期几 | 							// 如果指定了是星期几 | ||||||
| 							//获取当前日期是属于星期几 | 							// 获取当前日期是属于星期几 | ||||||
| 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); | 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); | ||||||
| 							//校验当前星期是否在星期池(dayRuleSup)中 | 							// 校验当前星期是否在星期池(dayRuleSup)中 | ||||||
| 							if (Array.indexOf(this.dayRuleSup, thisWeek) < 0) { | 							if (Array.indexOf(this.dayRuleSup, thisWeek) < 0) { | ||||||
| 								// 如果到达最大值时 | 								// 如果到达最大值时 | ||||||
| 								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; | ||||||
| 							} | 							} | ||||||
| 						} else if (this.dayRule == 'assWeek') { | 						} else if (this.dayRule == 'assWeek') { | ||||||
| 							//如果指定了是第几周的星期几 | 							// 如果指定了是第几周的星期几 | ||||||
| 							//获取每月1号是属于星期几 | 							// 获取每月1号是属于星期几 | ||||||
| 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); | 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); | ||||||
| 							if (this.dayRuleSup[1] >= thisWeek) { | 							if (this.dayRuleSup[1] >= thisWeek) { | ||||||
| 								DD = (this.dayRuleSup[0] - 1) * 7 + this.dayRuleSup[1] - thisWeek + 1; | 								DD = (this.dayRuleSup[0] - 1) * 7 + this.dayRuleSup[1] - thisWeek + 1; | ||||||
| @ -222,17 +222,17 @@ export default { | |||||||
| 								DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1; | 								DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1; | ||||||
| 							} | 							} | ||||||
| 						} else if (this.dayRule == 'lastWeek') { | 						} else if (this.dayRule == 'lastWeek') { | ||||||
| 							//如果指定了每月最后一个星期几 | 							// 如果指定了每月最后一个星期几 | ||||||
| 							//校验并调整如果是2月30号这种日期传进来时需调整至正常月底 | 							// 校验并调整如果是2月30号这种日期传进来时需调整至正常月底 | ||||||
| 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | ||||||
| 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { | ||||||
| 									DD--; | 									DD--; | ||||||
| 									thisDD = DD < 10 ? '0' + DD : DD; | 									thisDD = DD < 10 ? '0' + DD : DD; | ||||||
| 								} | 								} | ||||||
| 							} | 							} | ||||||
| 							//获取月末最后一天是星期几 | 							// 获取月末最后一天是星期几 | ||||||
| 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); | 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); | ||||||
| 							//找到要求中最近的那个星期几 | 							// 找到要求中最近的那个星期几 | ||||||
| 							if (this.dayRuleSup < thisWeek) { | 							if (this.dayRuleSup < thisWeek) { | ||||||
| 								DD -= thisWeek - this.dayRuleSup; | 								DD -= thisWeek - this.dayRuleSup; | ||||||
| 							} else if (this.dayRuleSup > thisWeek) { | 							} else if (this.dayRuleSup > thisWeek) { | ||||||
| @ -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; | ||||||
| 										} | 										} | ||||||
| @ -296,9 +296,9 @@ export default { | |||||||
| 										resultArr.push(YY + '-' + MM + '-' + DD + ' ' + hh + ':' + mm + ':' + ss) | 										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) { | 									if (si == sDate.length - 1) { | ||||||
| 										resetSecond(); | 										resetSecond(); | ||||||
| 										if (mi == mDate.length - 1) { | 										if (mi == mDate.length - 1) { | ||||||
| @ -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) { | ||||||
| @ -339,7 +339,7 @@ export default { | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 		}, | 		}, | ||||||
| 		//用于计算某位数字在数组中的索引 | 		// 用于计算某位数字在数组中的索引 | ||||||
| 		getIndex(arr, value) { | 		getIndex(arr, value) { | ||||||
| 			if (value <= arr[0] || value > arr[arr.length - 1]) { | 			if (value <= arr[0] || value > arr[arr.length - 1]) { | ||||||
| 				return 0; | 				return 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) | ||||||
| @ -377,7 +377,7 @@ export default { | |||||||
| 		}, | 		}, | ||||||
| 		// 获取"日"数组-主要为日期规则 | 		// 获取"日"数组-主要为日期规则 | ||||||
| 		getWeekArr(rule) { | 		getWeekArr(rule) { | ||||||
| 			//只有当日期规则的两个值均为“”时则表达日期是有选项的 | 			// 只有当日期规则的两个值均为“”时则表达日期是有选项的 | ||||||
| 			if (this.dayRule == '' && this.dayRuleSup == '') { | 			if (this.dayRule == '' && this.dayRuleSup == '') { | ||||||
| 				if (rule.indexOf('-') >= 0) { | 				if (rule.indexOf('-') >= 0) { | ||||||
| 					this.dayRule = 'weekDay'; | 					this.dayRule = 'weekDay'; | ||||||
| @ -401,7 +401,7 @@ export default { | |||||||
| 					this.dayRule = 'weekDay'; | 					this.dayRule = 'weekDay'; | ||||||
| 					this.dayRuleSup = this.getAssignArr(rule) | 					this.dayRuleSup = this.getAssignArr(rule) | ||||||
| 				} | 				} | ||||||
| 				//如果weekDay时将7调整为0【week值0即是星期日】 | 				// 如果weekDay时将7调整为0【week值0即是星期日】 | ||||||
| 				if (this.dayRule == 'weekDay') { | 				if (this.dayRule == 'weekDay') { | ||||||
| 					for (let i = 0; i < this.dayRuleSup.length; i++) { | 					for (let i = 0; i < this.dayRuleSup.length; i++) { | ||||||
| 						if (this.dayRuleSup[i] == 7) { | 						if (this.dayRuleSup[i] == 7) { | ||||||
| @ -502,7 +502,7 @@ export default { | |||||||
| 		}, | 		}, | ||||||
| 		// 根据规则返回一个具有周期性的数组 | 		// 根据规则返回一个具有周期性的数组 | ||||||
| 		getCycleArr(rule, limit, status) { | 		getCycleArr(rule, limit, status) { | ||||||
| 			//status--表示是否从0开始(则从1开始) | 			// status--表示是否从0开始(则从1开始) | ||||||
| 			let arr = []; | 			let arr = []; | ||||||
| 			let cycleArr = rule.split('-'); | 			let cycleArr = rule.split('-'); | ||||||
| 			let min = Number(cycleArr[0]); | 			let min = Number(cycleArr[0]); | ||||||
| @ -520,7 +520,7 @@ export default { | |||||||
| 			arr.sort(this.compare) | 			arr.sort(this.compare) | ||||||
| 			return arr; | 			return arr; | ||||||
| 		}, | 		}, | ||||||
| 		//比较数字大小(用于Array.sort) | 		// 比较数字大小(用于Array.sort) | ||||||
| 		compare(value1, value2) { | 		compare(value1, value2) { | ||||||
| 			if (value2 - value1 > 0) { | 			if (value2 - value1 > 0) { | ||||||
| 				return -1; | 				return -1; | ||||||
|  | |||||||
| @ -86,7 +86,7 @@ export default { | |||||||
| 			} | 			} | ||||||
| 		}, | 		}, | ||||||
| 		othChange() { | 		othChange() { | ||||||
| 			//反解析  | 			// 反解析 | ||||||
| 			let ins = this.cron.second | 			let ins = this.cron.second | ||||||
| 			('反解析 second', ins); | 			('反解析 second', ins); | ||||||
| 			if (ins === '*') { | 			if (ins === '*') { | ||||||
|  | |||||||
| @ -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'); | ||||||
|  | |||||||
| @ -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'); | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 RuoYi
						RuoYi