重置功能修改，

?：只能用在DayOfMonth和DayOfWeek两个域

ruoyi-ui/src/components/Crontab/day.vue

@@ -15,23 +15,28 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
 				周期从
-				<el-input-number v-model='cycle01' :min="0" :max="31" /> -
+				<el-input-number v-model='cycle01' :min="0" :max="31"/>
-				<el-input-number v-model='cycle02' :min="0" :max="31" /> 日
+				-
+				<el-input-number v-model='cycle02' :min="0" :max="31"/>
+				日
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
 				从
-				<el-input-number v-model='average01' :min="0" :max="31" /> 号开始，每
+				<el-input-number v-model='average01' :min="0" :max="31"/>
-				<el-input-number v-model='average02' :min="0" :max="31" /> 日执行一次
+				号开始，每
+				<el-input-number v-model='average02' :min="0" :max="31"/>
+				日执行一次
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="5">
 				每月
-				<el-input-number v-model='workday' :min="0" :max="31" /> 号最近的那个工作日
+				<el-input-number v-model='workday' :min="0" :max="31"/>
+				号最近的那个工作日
 			</el-radio>
 		</el-form-item>
 
@@ -69,23 +74,19 @@ export default {
 	name: 'crontab-day',
 	props: ['check', 'cron'],
 	methods: {
+		init() {
+			this.workday = 1
+			this.cycle01 = 1
+			this.cycle02 = 2
+			this.average01 = 1
+			this.average02 = 1
+			this.checkboxList = []
+		},
 		// 单选按钮值变化时
 		radioChange() {
 			('day rachange');
 			if (this.radioValue === 1) {
 				this.$emit('update', 'day', '*', 'day');
-				this.$emit('update', 'week', '?', 'day');
-				this.$emit('update', 'month', '*', 'day');
-			} else {
-				if (this.cron.hour === '*') {
-					this.$emit('update', 'hour', '0', 'day');
-				}
-				if (this.cron.min === '*') {
-					this.$emit('update', 'min', '0', 'day');
-				}
-				if (this.cron.second === '*') {
-					this.$emit('update', 'second', '0', 'day');
-				}
 			}
 
 			switch (this.radioValue) {

ruoyi-ui/src/components/Crontab/hour.vue

@@ -9,16 +9,20 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="2">
 				周期从
-				<el-input-number v-model='cycle01' :min="0" :max="60" /> -
+				<el-input-number v-model='cycle01' :min="0" :max="60"/>
-				<el-input-number v-model='cycle02' :min="0" :max="60" /> 小时
+				-
+				<el-input-number v-model='cycle02' :min="0" :max="60"/>
+				小时
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
 				从
-				<el-input-number v-model='average01' :min="0" :max="60" /> 小时开始，每
+				<el-input-number v-model='average01' :min="0" :max="60"/>
-				<el-input-number v-model='average02' :min="0" :max="60" /> 小时执行一次
+				小时开始，每
+				<el-input-number v-model='average02' :min="0" :max="60"/>
+				小时执行一次
 			</el-radio>
 		</el-form-item>
 
@@ -49,18 +53,17 @@ export default {
 	name: 'crontab-hour',
 	props: ['check', 'cron'],
 	methods: {
+		init() {
+			this.cycle01 = 0
+			this.cycle02 = 1
+			this.average01 = 0
+			this.average02 = 1
+			this.checkboxList = []
+		},
 		// 单选按钮值变化时
 		radioChange() {
 			if (this.radioValue === 1) {
 				this.$emit('update', 'hour', '*', 'hour');
-				this.$emit('update', 'day', '*', 'hour');
-			} else {
-				if (this.cron.min === '*') {
-					this.$emit('update', 'min', '0', 'hour');
-				}
-				if (this.cron.second === '*') {
-					this.$emit('update', 'second', '0', 'hour');
-				}
 			}
 			switch (this.radioValue) {
 				case 2:

ruoyi-ui/src/components/Crontab/index.vue

@@ -188,7 +188,7 @@ export default {
 				insValue;
 
 			if (!this.$refs[refName]) return;
-
+			this.$refs[refName].init()
 			if (arr.includes(name)) {
 				if (value === "*") {
 					insValue = 1;
@@ -368,6 +368,7 @@ export default {
 	text-align: center;
 	margin-top: 20px;
 }
+
 .popup-main {
 	position: relative;
 	margin: 10px auto;
@@ -376,12 +377,14 @@ export default {
 	font-size: 12px;
 	overflow: hidden;
 }
+
 .popup-title {
 	overflow: hidden;
 	line-height: 34px;
 	padding-top: 6px;
 	background: #f2f2f2;
 }
+
 .popup-result {
 	box-sizing: border-box;
 	line-height: 24px;
@@ -390,6 +393,7 @@ export default {
 	border: 1px solid #ccc;
 	position: relative;
 }
+
 .popup-result .title {
 	position: absolute;
 	top: -28px;
@@ -401,11 +405,13 @@ export default {
 	line-height: 30px;
 	background: #fff;
 }
+
 .popup-result table {
 	text-align: center;
 	width: 100%;
 	margin: 0 auto;
 }
+
 .popup-result table span {
 	display: block;
 	width: 100%;
@@ -416,6 +422,7 @@ export default {
 	overflow: hidden;
 	border: 1px solid #e8e8e8;
 }
+
 .popup-result-scroll {
 	font-size: 12px;
 	line-height: 24px;

ruoyi-ui/src/components/Crontab/min.vue

@@ -50,11 +50,15 @@ export default {
 	name: 'crontab-min',
 	props: ['check', 'cron'],
 	methods: {
+    init() {
+      this.cycle01 = 1
+      this.cycle02 = 2
+      this.average01 = 0
+      this.average02 = 1
+      this.checkboxList = []
+    },
 		// 单选按钮值变化时
 		radioChange() {
-			if (this.radioValue !== 1 && this.cron.second === '*') {
-				this.$emit('update', 'second', '0', 'min');
-			}
 			switch (this.radioValue) {
 				case 1:
 					this.$emit('update', 'min', '*', 'min');

ruoyi-ui/src/components/Crontab/month.vue

@@ -49,24 +49,17 @@ export default {
 	name: 'crontab-month',
 	props: ['check', 'cron'],
 	methods: {
+    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:

ruoyi-ui/src/components/Crontab/second.vue

@@ -25,7 +25,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%" @change="ch">
 					<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
 				</el-select>
 			</el-radio>
@@ -49,12 +49,18 @@ export default {
 	name: 'crontab-second',
 	props: ['check', 'radioParent'],
 	methods: {
+    init() {
+      this.cycle01 = 1
+      this.cycle02 = 2
+      this.average01 = 0
+      this.average02 = 1
+      this.checkboxList = []
+    },
 		// 单选按钮值变化时
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
 					this.$emit('update', 'second', '*', 'second');
-					this.$emit('update', 'min', '*', 'second');
 					break;
 				case 2:
 					this.$emit('update', 'second', this.cycle01 + '-' + this.cycle02);

ruoyi-ui/src/components/Crontab/week.vue

@@ -15,7 +15,8 @@
     <el-form-item>
       <el-radio v-model='radioValue' :label="3">
         周期从星期
-				<el-input-number v-model='cycle01' :min="1" :max="7" /> -
+        <el-input-number v-model='cycle01' :min="1" :max="7"/>
+        -
         <el-input-number v-model='cycle02' :min="1" :max="7"/>
       </el-radio>
     </el-form-item>
@@ -23,7 +24,8 @@
     <el-form-item>
       <el-radio v-model='radioValue' :label="4">
         第
-				<el-input-number v-model='average01' :min="1" :max="4" /> 周的星期
+        <el-input-number v-model='average01' :min="1" :max="4"/>
+        周的星期
         <el-input-number v-model='average02' :min="1" :max="7"/>
       </el-radio>
     </el-form-item>
@@ -38,7 +40,7 @@
     <el-form-item>
       <el-radio v-model='radioValue' :label="6">
         指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+        <el-select clearable v-model="checkboxDescribeList" placeholder="可多选" multiple style="width:100%">
           <el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{ item }}</el-option>
         </el-select>
       </el-radio>
@@ -58,6 +60,7 @@ export default {
       average01: 1,
       average02: 1,
       checkboxList: [],
+      checkboxDescribeList: [],
       weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
       checkNum: this.$options.propsData.check
     }
@@ -65,31 +68,32 @@ export default {
   name: 'crontab-week',
   props: ['check', 'cron'],
   methods: {
+    checkChange(data) {
+      this.checkboxList = []
+      data.forEach(value => {
+        this.weekList.find((item, index) => {
+          if (item === value) {
+            this.checkboxList.push(index + 1)
+          }
+        })
+      })
+    },
+    init() {
+      this.workday = 1
+      this.cycle01 = 1
+      this.cycle02 = 2
+      this.average01 = 1
+      this.average02 = 1
+      this.checkboxList = []
+      this.checkboxDescribeList = []
+    },
     // 单选按钮值变化时
     radioChange() {
-			if (this.radioValue === 1) {
+
-				this.$emit('update', 'week', '*');
+
-				this.$emit('update', 'year', '*');
-			} else {
-				if (this.cron.month === '*') {
-					this.$emit('update', 'month', '0', 'week');
-				}
-				if (this.cron.day === '*') {
-					this.$emit('update', 'day', '0', 'week');
-				}
-				if (this.cron.hour === '*') {
-					this.$emit('update', 'hour', '0', 'week');
-				}
-				if (this.cron.min === '*') {
-					this.$emit('update', 'min', '0', 'week');
-				}
-				if (this.cron.second === '*') {
-					this.$emit('update', 'second', '0', 'week');
-				}
-			}
       switch (this.radioValue) {
-				case 2:
+        case 1:
-					this.$emit('update', 'week', '?');
+          this.$emit('update', 'week', '*');
           break;
         case 3:
           this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
@@ -104,6 +108,13 @@ export default {
           this.$emit('update', 'week', this.checkboxString);
           break;
       }
+      if (this.radioValue === 2) {
+        this.$emit('update', 'week', '?');
+        this.$emit('update', 'day', '*');
+      } else {
+        this.$emit('update', 'day', '?');
+
+      }
     },
     // 根据互斥事件，更改radio的值
 

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', '');