From cfdd6231798c4141126a2fc0df91633f528b8638 Mon Sep 17 00:00:00 2001
From: yjb <yjb@greenism.net>
Date: Sat, 23 Oct 2021 23:25:03 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=9C=80=E8=A6=81=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=9B=9E=E5=A4=8D=E5=88=B0=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=88=E9=80=89=E6=8B=A9=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?(0=200=200=200=200=201-2=20)=EF=BC=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB3=E6=AC=A1=E9=87=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=89=8D=E8=83=BD=E9=87=8D=E7=BD=AE=E5=88=B0(=20*=20*=20*=20*?=
 =?UTF-8?q?=20=3F)=202=E3=80=81=E5=88=A0=E9=99=A4=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E4=B8=80=E9=A1=B9=E9=83=BD=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=87=AA=E8=A1=8C=E5=A1=AB=E5=86=99=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E8=87=AA=E5=8A=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/Crontab/day.vue    | 336 +++++++++++----------
 ruoyi-ui/src/components/Crontab/hour.vue   | 234 +++++++-------
 ruoyi-ui/src/components/Crontab/min.vue    |   5 +-
 ruoyi-ui/src/components/Crontab/month.vue  |   6 +-
 ruoyi-ui/src/components/Crontab/second.vue | 252 ++++++++--------
 ruoyi-ui/src/components/Crontab/week.vue   |  15 +-
 6 files changed, 437 insertions(+), 411 deletions(-)

diff --git a/ruoyi-ui/src/components/Crontab/day.vue b/ruoyi-ui/src/components/Crontab/day.vue
index d2f67298f..901cef9f9 100644
--- a/ruoyi-ui/src/components/Crontab/day.vue
+++ b/ruoyi-ui/src/components/Crontab/day.vue
@@ -1,180 +1,184 @@
 <template>
-	<el-form size="small">
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="1">
-				日，允许的通配符[, - * / L M]
-			</el-radio>
-		</el-form-item>
+  <el-form size="small">
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        日，允许的通配符[, - * / L M]
+      </el-radio>
+    </el-form-item>
 
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="2">
-				不指定
-			</el-radio>
-		</el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="2">
+        不指定
+      </el-radio>
+    </el-form-item>
 
-		<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='cycle02' :min="0" :max="31"/>
-				日
-			</el-radio>
-		</el-form-item>
+    <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='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='average02' :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='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-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-radio>
+    </el-form-item>
 
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="6">
-				本月最后一天
-			</el-radio>
-		</el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="6">
+        本月最后一天
+      </el-radio>
+    </el-form-item>
 
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="7">
-				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
-					<el-option v-for="item in 31" :key="item" :value="item">{{ item }}</el-option>
-				</el-select>
-			</el-radio>
-		</el-form-item>
-	</el-form>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="7">
+        指定
+        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"
+                   @change="selectChange">
+          <el-option v-for="item in 31" :key="item" :value="item">{{ item }}</el-option>
+        </el-select>
+      </el-radio>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script>
 export default {
-	data() {
-		return {
-			radioValue: 1,
-			workday: 1,
-			cycle01: 1,
-			cycle02: 2,
-			average01: 1,
-			average02: 1,
-			checkboxList: [],
-			checkNum: this.$options.propsData.check
-		}
-	},
-	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');
-			}
+  data() {
+    return {
+      radioValue: 1,
+      workday: 1,
+      cycle01: 1,
+      cycle02: 2,
+      average01: 1,
+      average02: 1,
+      checkboxList: [],
+      checkNum: this.$options.propsData.check
+    }
+  },
+  name: 'crontab-day',
+  props: ['check', 'cron'],
+  methods: {
+    selectChange() {
+      this.radioValue = 7
+    },
+    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');
+      }
 
-			switch (this.radioValue) {
-				case 2:
-					this.$emit('update', 'day', '?');
-					break;
-				case 3:
-					this.$emit('update', 'day', this.cycle01 + '-' + this.cycle02);
-					break;
-				case 4:
-					this.$emit('update', 'day', this.average01 + '/' + this.average02);
-					break;
-				case 5:
-					this.$emit('update', 'day', this.workday + 'W');
-					break;
-				case 6:
-					this.$emit('update', 'day', 'L');
-					break;
-				case 7:
-					this.$emit('update', 'day', this.checkboxString);
-					break;
-			}
-			('day rachange end');
-		},
-		// 周期两个值变化时
-		cycleChange() {
-			if (this.radioValue == '3') {
-				this.$emit('update', 'day', this.cycleTotal);
-			}
-		},
-		// 平均两个值变化时
-		averageChange() {
-			if (this.radioValue == '4') {
-				this.$emit('update', 'day', this.averageTotal);
-			}
-		},
-		// 最近工作日值变化时
-		workdayChange() {
-			if (this.radioValue == '5') {
-				this.$emit('update', 'day', this.workday + 'W');
-			}
-		},
-		// checkbox值变化时
-		checkboxChange() {
-			if (this.radioValue == '7') {
-				this.$emit('update', 'day', this.checkboxString);
-			}
-		},
-		// 父组件传递的week发生变化触发
-		weekChange() {
-			//判断week值与day不能同时为“?”
-			if (this.cron.week == '?' && this.radioValue == '2') {
-				this.radioValue = '1';
-			} else if (this.cron.week !== '?' && this.radioValue != '2') {
-				this.radioValue = '2';
-			}
-		},
-	},
-	watch: {
-		"radioValue": "radioChange",
-		'cycleTotal': 'cycleChange',
-		'averageTotal': 'averageChange',
-		'workdayCheck': 'workdayChange',
-		'checkboxString': 'checkboxChange',
-	},
-	computed: {
-		// 计算两个周期值
-		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 1, 31)
-			this.cycle02 = this.checkNum(this.cycle02, 1, 31)
-			return this.cycle01 + '-' + this.cycle02;
-		},
-		// 计算平均用到的值
-		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 1, 31)
-			this.average02 = this.checkNum(this.average02, 1, 31)
-			return this.average01 + '/' + this.average02;
-		},
-		// 计算工作日格式
-		workdayCheck: function () {
-			this.workday = this.checkNum(this.workday, 1, 31)
-			return this.workday;
-		},
-		// 计算勾选的checkbox值合集
-		checkboxString: function () {
-			let str = this.checkboxList.join();
-			return str == '' ? '*' : str;
-		}
-	}
+      switch (this.radioValue) {
+        case 2:
+          this.$emit('update', 'day', '?');
+          break;
+        case 3:
+          this.$emit('update', 'day', this.cycle01 + '-' + this.cycle02);
+          break;
+        case 4:
+          this.$emit('update', 'day', this.average01 + '/' + this.average02);
+          break;
+        case 5:
+          this.$emit('update', 'day', this.workday + 'W');
+          break;
+        case 6:
+          this.$emit('update', 'day', 'L');
+          break;
+        case 7:
+          this.$emit('update', 'day', this.checkboxString);
+          break;
+      }
+      ('day rachange end');
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'day', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'day', this.averageTotal);
+      }
+    },
+    // 最近工作日值变化时
+    workdayChange() {
+      if (this.radioValue == '5') {
+        this.$emit('update', 'day', this.workday + 'W');
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '7') {
+        this.$emit('update', 'day', this.checkboxString);
+      }
+    },
+    // 父组件传递的week发生变化触发
+    weekChange() {
+      //判断week值与day不能同时为“?”
+      if (this.cron.week == '?' && this.radioValue == '2') {
+        this.radioValue = '1';
+      } else if (this.cron.week !== '?' && this.radioValue != '2') {
+        this.radioValue = '2';
+      }
+    },
+  },
+  watch: {
+    "radioValue": "radioChange",
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'workdayCheck': 'workdayChange',
+    'checkboxString': 'checkboxChange',
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      this.cycle01 = this.checkNum(this.cycle01, 1, 31)
+      this.cycle02 = this.checkNum(this.cycle02, 1, 31)
+      return this.cycle01 + '-' + this.cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      this.average01 = this.checkNum(this.average01, 1, 31)
+      this.average02 = this.checkNum(this.average02, 1, 31)
+      return this.average01 + '/' + this.average02;
+    },
+    // 计算工作日格式
+    workdayCheck: function () {
+      this.workday = this.checkNum(this.workday, 1, 31)
+      return this.workday;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
 }
 </script>
diff --git a/ruoyi-ui/src/components/Crontab/hour.vue b/ruoyi-ui/src/components/Crontab/hour.vue
index 236691d12..c4bf01ca2 100644
--- a/ruoyi-ui/src/components/Crontab/hour.vue
+++ b/ruoyi-ui/src/components/Crontab/hour.vue
@@ -1,125 +1,129 @@
 <template>
-	<el-form size="small">
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="1">
-				小时，允许的通配符[, - * /]
-			</el-radio>
-		</el-form-item>
+  <el-form size="small">
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        小时，允许的通配符[, - * /]
+      </el-radio>
+    </el-form-item>
 
-		<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='cycle02' :min="0" :max="60"/>
-				小时
-			</el-radio>
-		</el-form-item>
+    <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='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='average02' :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='average02' :min="0" :max="60"/>
+        小时执行一次
+      </el-radio>
+    </el-form-item>
 
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="4">
-				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
-					<el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
-				</el-select>
-			</el-radio>
-		</el-form-item>
-	</el-form>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="4">
+        指定
+        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"
+                   @change="selectChange">
+          <el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
+        </el-select>
+      </el-radio>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script>
 export default {
-	data() {
-		return {
-			radioValue: 1,
-			cycle01: 0,
-			cycle02: 1,
-			average01: 0,
-			average02: 1,
-			checkboxList: [],
-			checkNum: this.$options.propsData.check
-		}
-	},
-	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');
-			}
-			switch (this.radioValue) {
-				case 2:
-					this.$emit('update', 'hour', this.cycle01 + '-' + this.cycle02);
-					break;
-				case 3:
-					this.$emit('update', 'hour', this.average01 + '/' + this.average02);
-					break;
-				case 4:
-					this.$emit('update', 'hour', this.checkboxString);
-					break;
-			}
-		},
-		// 周期两个值变化时
-		cycleChange() {
-			if (this.radioValue == '2') {
-				this.$emit('update', 'hour', this.cycleTotal);
-			}
-		},
-		// 平均两个值变化时
-		averageChange() {
-			if (this.radioValue == '3') {
-				this.$emit('update', 'hour', this.averageTotal);
-			}
-		},
-		// checkbox值变化时
-		checkboxChange() {
-			if (this.radioValue == '4') {
-				this.$emit('update', 'hour', this.checkboxString);
-			}
-		}
-	},
-	watch: {
-		"radioValue": "radioChange",
-		'cycleTotal': 'cycleChange',
-		'averageTotal': 'averageChange',
-		'checkboxString': 'checkboxChange'
-	},
-	computed: {
-		// 计算两个周期值
-		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 0, 23)
-			this.cycle02 = this.checkNum(this.cycle02, 0, 23)
-			return this.cycle01 + '-' + this.cycle02;
-		},
-		// 计算平均用到的值
-		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 0, 23)
-			this.average02 = this.checkNum(this.average02, 1, 23)
-			return this.average01 + '/' + this.average02;
-		},
-		// 计算勾选的checkbox值合集
-		checkboxString: function () {
-			let str = this.checkboxList.join();
-			return str == '' ? '*' : str;
-		}
-	}
+  data() {
+    return {
+      radioValue: 1,
+      cycle01: 0,
+      cycle02: 1,
+      average01: 0,
+      average02: 1,
+      checkboxList: [],
+      checkNum: this.$options.propsData.check
+    }
+  },
+  name: 'crontab-hour',
+  props: ['check', 'cron'],
+  methods: {
+    selectChange() {
+      this.radioValue = 4
+    },
+    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');
+      }
+      switch (this.radioValue) {
+        case 2:
+          this.$emit('update', 'hour', this.cycle01 + '-' + this.cycle02);
+          break;
+        case 3:
+          this.$emit('update', 'hour', this.average01 + '/' + this.average02);
+          break;
+        case 4:
+          this.$emit('update', 'hour', this.checkboxString);
+          break;
+      }
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '2') {
+        this.$emit('update', 'hour', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'hour', this.averageTotal);
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'hour', this.checkboxString);
+      }
+    }
+  },
+  watch: {
+    "radioValue": "radioChange",
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'checkboxString': 'checkboxChange'
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      this.cycle01 = this.checkNum(this.cycle01, 0, 23)
+      this.cycle02 = this.checkNum(this.cycle02, 0, 23)
+      return this.cycle01 + '-' + this.cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      this.average01 = this.checkNum(this.average01, 0, 23)
+      this.average02 = this.checkNum(this.average02, 1, 23)
+      return this.average01 + '/' + this.average02;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
 }
 </script>
diff --git a/ruoyi-ui/src/components/Crontab/min.vue b/ruoyi-ui/src/components/Crontab/min.vue
index 41d7bb19b..55befd0d3 100644
--- a/ruoyi-ui/src/components/Crontab/min.vue
+++ b/ruoyi-ui/src/components/Crontab/min.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="selectChange">
 					<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
 				</el-select>
 			</el-radio>
@@ -50,6 +50,9 @@ export default {
 	name: 'crontab-min',
 	props: ['check', 'cron'],
 	methods: {
+    selectChange() {
+      this.radioValue = 4
+    },
     init() {
       this.cycle01 = 1
       this.cycle02 = 2
diff --git a/ruoyi-ui/src/components/Crontab/month.vue b/ruoyi-ui/src/components/Crontab/month.vue
index 1ebcb3b97..1f5f64110 100644
--- a/ruoyi-ui/src/components/Crontab/month.vue
+++ b/ruoyi-ui/src/components/Crontab/month.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="selectChange">
 					<el-option v-for="item in 12" :key="item" :value="item">{{item}}</el-option>
 				</el-select>
 			</el-radio>
@@ -48,7 +48,9 @@ export default {
 	},
 	name: 'crontab-month',
 	props: ['check', 'cron'],
-	methods: {
+	methods: {    selectChange() {
+      this.radioValue = 4
+    },
     init() {
       this.cycle01 = 1
       this.cycle02 = 2
diff --git a/ruoyi-ui/src/components/Crontab/second.vue b/ruoyi-ui/src/components/Crontab/second.vue
index 60bda69b2..b001eaeb9 100644
--- a/ruoyi-ui/src/components/Crontab/second.vue
+++ b/ruoyi-ui/src/components/Crontab/second.vue
@@ -1,54 +1,62 @@
 <template>
-	<el-form size="small">
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="1">
-				秒，允许的通配符[, - * /]
-			</el-radio>
-		</el-form-item>
+  <el-form size="small">
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        秒，允许的通配符[, - * /]
+      </el-radio>
+    </el-form-item>
 
-		<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='cycle02' :min="0" :max="60" /> 秒
-			</el-radio>
-		</el-form-item>
+    <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='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='average02' :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='average02' :min="0" :max="60"/>
+        秒执行一次
+      </el-radio>
+    </el-form-item>
 
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="4">
-				指定
-				<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>
-		</el-form-item>
-	</el-form>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="4">
+        指定
+        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"
+                   @change="selectChange">
+          <el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
+        </el-select>
+      </el-radio>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script>
 export default {
-	data() {
-		return {
-			radioValue: 1,
-			cycle01: 1,
-			cycle02: 2,
-			average01: 0,
-			average02: 1,
-			checkboxList: [],
-			checkNum: this.$options.propsData.check
-		}
-	},
-	name: 'crontab-second',
-	props: ['check', 'radioParent'],
-	methods: {
+  data() {
+    return {
+      radioValue: 1,
+      cycle01: 1,
+      cycle02: 2,
+      average01: 0,
+      average02: 1,
+      checkboxList: [],
+      checkNum: this.$options.propsData.check
+    }
+  },
+  name: 'crontab-second',
+  props: ['check', 'radioParent'],
+  methods: {
+    selectChange() {
+      this.radioValue = 4
+    },
     init() {
       this.cycle01 = 1
       this.cycle02 = 2
@@ -56,84 +64,84 @@ export default {
       this.average02 = 1
       this.checkboxList = []
     },
-		// 单选按钮值变化时
-		radioChange() {
-			switch (this.radioValue) {
-				case 1:
-					this.$emit('update', 'second', '*', 'second');
-					break;
-				case 2:
-					this.$emit('update', 'second', this.cycle01 + '-' + this.cycle02);
-					break;
-				case 3:
-					this.$emit('update', 'second', this.average01 + '/' + this.average02);
-					break;
-				case 4:
-					this.$emit('update', 'second', this.checkboxString);
-					break;
-			}
-		},
-		// 周期两个值变化时
-		cycleChange() {
-			if (this.radioValue == '2') {
-				this.$emit('update', 'second', this.cycleTotal);
-			}
-		},
-		// 平均两个值变化时
-		averageChange() {
-			if (this.radioValue == '3') {
-				this.$emit('update', 'second', this.averageTotal);
-			}
-		},
-		// checkbox值变化时
-		checkboxChange() {
-			if (this.radioValue == '4') {
-				this.$emit('update', 'second', this.checkboxString);
-			}
-		},
-		othChange() {
-			// 反解析
-			let ins = this.cron.second
-			('反解析 second', ins);
-			if (ins === '*') {
-				this.radioValue = 1;
-			} else if (ins.indexOf('-') > -1) {
-				this.radioValue = 2
-			} else if (ins.indexOf('/') > -1) {
-				this.radioValue = 3
-			} else {
-				this.radioValue = 4
-				this.checkboxList = ins.split(',')
-			}
-		}
-	},
-	watch: {
-		"radioValue": "radioChange",
-		'cycleTotal': 'cycleChange',
-		'averageTotal': 'averageChange',
-		'checkboxString': 'checkboxChange',
-		radioParent() {
-			this.radioValue = this.radioParent
-		}
-	},
-	computed: {
-		// 计算两个周期值
-		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 0, 59)
-			this.cycle02 = this.checkNum(this.cycle02, 0, 59)
-			return this.cycle01 + '-' + this.cycle02;
-		},
-		// 计算平均用到的值
-		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 0, 59)
-			this.average02 = this.checkNum(this.average02, 1, 59)
-			return this.average01 + '/' + this.average02;
-		},
-		// 计算勾选的checkbox值合集
-		checkboxString: function () {
-			let str = this.checkboxList.join();
-			return str == '' ? '*' : str;
-		}
-	}
+    // 单选按钮值变化时
+    radioChange() {
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'second', '*', 'second');
+          break;
+        case 2:
+          this.$emit('update', 'second', this.cycle01 + '-' + this.cycle02);
+          break;
+        case 3:
+          this.$emit('update', 'second', this.average01 + '/' + this.average02);
+          break;
+        case 4:
+          this.$emit('update', 'second', this.checkboxString);
+          break;
+      }
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '2') {
+        this.$emit('update', 'second', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'second', this.averageTotal);
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'second', this.checkboxString);
+      }
+    },
+    othChange() {
+      // 反解析
+      let ins = this.cron.second
+      ('反解析 second', ins);
+      if (ins === '*') {
+        this.radioValue = 1;
+      } else if (ins.indexOf('-') > -1) {
+        this.radioValue = 2
+      } else if (ins.indexOf('/') > -1) {
+        this.radioValue = 3
+      } else {
+        this.radioValue = 4
+        this.checkboxList = ins.split(',')
+      }
+    }
+  },
+  watch: {
+    "radioValue": "radioChange",
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'checkboxString': 'checkboxChange',
+    radioParent() {
+      this.radioValue = this.radioParent
+    }
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      this.cycle01 = this.checkNum(this.cycle01, 0, 59)
+      this.cycle02 = this.checkNum(this.cycle02, 0, 59)
+      return this.cycle01 + '-' + this.cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      this.average01 = this.checkNum(this.average01, 0, 59)
+      this.average02 = this.checkNum(this.average02, 1, 59)
+      return this.average01 + '/' + this.average02;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
 }
 </script>
diff --git a/ruoyi-ui/src/components/Crontab/week.vue b/ruoyi-ui/src/components/Crontab/week.vue
index fda5fa4d8..f42fb60ad 100644
--- a/ruoyi-ui/src/components/Crontab/week.vue
+++ b/ruoyi-ui/src/components/Crontab/week.vue
@@ -40,7 +40,8 @@
     <el-form-item>
       <el-radio v-model='radioValue' :label="6">
         指定
-        <el-select clearable v-model="checkboxDescribeList" placeholder="可多选" multiple style="width:100%">
+        <el-select clearable v-model="checkboxDescribeList" placeholder="可多选" multiple style="width:100%"
+                   @change="selectChange">
           <el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{ item }}</el-option>
         </el-select>
       </el-radio>
@@ -68,11 +69,16 @@ export default {
   name: 'crontab-week',
   props: ['check', 'cron'],
   methods: {
-    checkChange(data) {
+    selectChange(data) {
+      console.log(data);
+      this.radioValue = 6
       this.checkboxList = []
+      this.checkboxDescribeList = []
       data.forEach(value => {
-        this.weekList.find((item, index) => {
-          if (item === value) {
+        this.weekList.forEach((item,index) => {
+          if (index+1 === value) {
+            console.log((item));
+            this.checkboxDescribeList.push(this.weekList[index])
             this.checkboxList.push(index + 1)
           }
         })
@@ -90,7 +96,6 @@ export default {
     // 单选按钮值变化时
     radioChange() {
 
-
       switch (this.radioValue) {
         case 1:
           this.$emit('update', 'week', '*');