From 492ee4fae5ebc8b37214dd12c43852d26883c766 Mon Sep 17 00:00:00 2001
From: yjb <yjb@greenism.net>
Date: Wed, 22 Sep 2021 18:54:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9Array.indexOf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/Crontab/result.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/components/Crontab/result.vue b/ruoyi-ui/src/components/Crontab/result.vue
index 07b963b79..537f34524 100644
--- a/ruoyi-ui/src/components/Crontab/result.vue
+++ b/ruoyi-ui/src/components/Crontab/result.vue
@@ -3,7 +3,7 @@
 		<p class="title">最近5次运行时间</p>
 		<ul class="popup-result-scroll">
 			<template v-if='isShow'>
-				<li v-for='item in resultList' :key="item">{{item}}</li>
+				<li v-for='item in resultList' :key="item">{{ item }}</li>
 			</template>
 			<li v-else>计算结果中...</li>
 		</ul>
@@ -25,7 +25,6 @@ export default {
 	methods: {
 		// 表达式值变化时，开始去计算结果
 		expressionChange() {
-
 			// 计算开始-隐藏结果
 			this.isShow = false;
 			// 获取规则数组[0秒、1分、2时、3日、4月、5星期、6年]
@@ -151,7 +150,6 @@ export default {
 							}
 							continue;
 						}
-
 						// 判断日期的合法性，不合法的话也是跳出当前循环
 						if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') {
 							resetDay();
@@ -160,7 +158,6 @@ export default {
 						// 如果日期规则中有值时
 						if (this.dayRule == 'lastDay') {
 							// 如果不是合法日期则需要将前将日期调到合法日期即月末最后一天
-
 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
 									DD--;
@@ -200,7 +197,7 @@ export default {
 							// 获取当前日期是属于星期几
 							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
 							// 校验当前星期是否在星期池（dayRuleSup）中
-							if (Array.indexOf(this.dayRuleSup, thisWeek) < 0) {
+							if (this.dayRuleSup.indexOf(thisWeek) < 0) {
 								// 如果到达最大值时
 								if (Di == DDate.length - 1) {
 									resetDay();
@@ -241,11 +238,9 @@ export default {
 						}
 						// 判断时间值是否小于10置换成“05”这种格式
 						DD = DD < 10 ? '0' + DD : DD;
-
 						// 循环“时”数组
 						goHour: for (let hi = hIdx; hi < hDate.length; hi++) {
 							let hh = hDate[hi] < 10 ? '0' + hDate[hi] : hDate[hi]
-
 							// 如果到达最大值时
 							if (nMin > mDate[mDate.length - 1]) {
 								resetMin();
@@ -266,7 +261,6 @@ export default {
 							// 循环"分"数组
 							goMin: for (let mi = mIdx; mi < mDate.length; mi++) {
 								let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi];
-
 								// 如果到达最大值时
 								if (nSecond > sDate[sDate.length - 1]) {
 									resetSecond();

From 6d709f9fab536ba398fa3760ed1b82eca8bc8d10 Mon Sep 17 00:00:00 2001
From: yjb <yjb@greenism.net>
Date: Wed, 22 Sep 2021 19:00:25 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=20=3F=EF=BC=9A=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E7=94=A8=E5=9C=A8DayOfMonth=E5=92=8CDayOfWeek=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/Crontab/day.vue    |  37 +-
 ruoyi-ui/src/components/Crontab/hour.vue   | 247 +++----
 ruoyi-ui/src/components/Crontab/index.vue  | 771 +++++++++++----------
 ruoyi-ui/src/components/Crontab/min.vue    | 244 +++----
 ruoyi-ui/src/components/Crontab/month.vue  |  21 +-
 ruoyi-ui/src/components/Crontab/second.vue |  10 +-
 ruoyi-ui/src/components/Crontab/week.vue   | 317 +++++----
 ruoyi-ui/src/components/Crontab/year.vue   |  23 +-
 8 files changed, 844 insertions(+), 826 deletions(-)

diff --git a/ruoyi-ui/src/components/Crontab/day.vue b/ruoyi-ui/src/components/Crontab/day.vue
index bf9f5664e..d2f67298f 100644
--- a/ruoyi-ui/src/components/Crontab/day.vue
+++ b/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='cycle02' :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-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-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-input-number v-model='workday' :min="0" :max="31"/>
+				号最近的那个工作日
 			</el-radio>
 		</el-form-item>
 
@@ -45,7 +50,7 @@
 			<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-option v-for="item in 31" :key="item" :value="item">{{ item }}</el-option>
 				</el-select>
 			</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) {
diff --git a/ruoyi-ui/src/components/Crontab/hour.vue b/ruoyi-ui/src/components/Crontab/hour.vue
index 5a1e14678..236691d12 100644
--- a/ruoyi-ui/src/components/Crontab/hour.vue
+++ b/ruoyi-ui/src/components/Crontab/hour.vue
@@ -1,122 +1,125 @@
-<template>
-	<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="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>
-</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: {
-		// 单选按钮值变化时
-		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:
-					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>
\ No newline at end of file
+<template>
+	<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="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>
+</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;
+		}
+	}
+}
+</script>
diff --git a/ruoyi-ui/src/components/Crontab/index.vue b/ruoyi-ui/src/components/Crontab/index.vue
index 27b4ab36c..5896e9335 100644
--- a/ruoyi-ui/src/components/Crontab/index.vue
+++ b/ruoyi-ui/src/components/Crontab/index.vue
@@ -1,110 +1,110 @@
 <template>
-  <div>
-    <el-tabs type="border-card">
-      <el-tab-pane label="秒" v-if="shouldHide('second')">
-        <CrontabSecond @update="updateCrontabValue" :check="checkNumber" ref="cronsecond" />
-      </el-tab-pane>
+	<div>
+		<el-tabs type="border-card">
+			<el-tab-pane label="秒" v-if="shouldHide('second')">
+				<CrontabSecond @update="updateCrontabValue" :check="checkNumber" ref="cronsecond"/>
+			</el-tab-pane>
 
-      <el-tab-pane label="分钟" v-if="shouldHide('min')">
-        <CrontabMin
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronmin"
-        />
-      </el-tab-pane>
+			<el-tab-pane label="分钟" v-if="shouldHide('min')">
+				<CrontabMin
+					@update="updateCrontabValue"
+					:check="checkNumber"
+					:cron="crontabValueObj"
+					ref="cronmin"
+				/>
+			</el-tab-pane>
 
-      <el-tab-pane label="小时" v-if="shouldHide('hour')">
-        <CrontabHour
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronhour"
-        />
-      </el-tab-pane>
+			<el-tab-pane label="小时" v-if="shouldHide('hour')">
+				<CrontabHour
+					@update="updateCrontabValue"
+					:check="checkNumber"
+					:cron="crontabValueObj"
+					ref="cronhour"
+				/>
+			</el-tab-pane>
 
-      <el-tab-pane label="日" v-if="shouldHide('day')">
-        <CrontabDay
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronday"
-        />
-      </el-tab-pane>
+			<el-tab-pane label="日" v-if="shouldHide('day')">
+				<CrontabDay
+					@update="updateCrontabValue"
+					:check="checkNumber"
+					:cron="crontabValueObj"
+					ref="cronday"
+				/>
+			</el-tab-pane>
 
-      <el-tab-pane label="月" v-if="shouldHide('month')">
-        <CrontabMonth
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronmonth"
-        />
-      </el-tab-pane>
+			<el-tab-pane label="月" v-if="shouldHide('month')">
+				<CrontabMonth
+					@update="updateCrontabValue"
+					:check="checkNumber"
+					:cron="crontabValueObj"
+					ref="cronmonth"
+				/>
+			</el-tab-pane>
 
-      <el-tab-pane label="周" v-if="shouldHide('week')">
-        <CrontabWeek
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronweek"
-        />
-      </el-tab-pane>
+			<el-tab-pane label="周" v-if="shouldHide('week')">
+				<CrontabWeek
+					@update="updateCrontabValue"
+					:check="checkNumber"
+					:cron="crontabValueObj"
+					ref="cronweek"
+				/>
+			</el-tab-pane>
 
-      <el-tab-pane label="年" v-if="shouldHide('year')">
-        <CrontabYear
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronyear"
-        />
-      </el-tab-pane>
-    </el-tabs>
+			<el-tab-pane label="年" v-if="shouldHide('year')">
+				<CrontabYear
+					@update="updateCrontabValue"
+					:check="checkNumber"
+					:cron="crontabValueObj"
+					ref="cronyear"
+				/>
+			</el-tab-pane>
+		</el-tabs>
 
-    <div class="popup-main">
-      <div class="popup-result">
-        <p class="title">时间表达式</p>
-        <table>
-          <thead>
-            <th v-for="item of tabTitles" width="40" :key="item">{{item}}</th>
-            <th>Cron 表达式</th>
-          </thead>
-          <tbody>
-            <td>
-              <span>{{crontabValueObj.second}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.min}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.hour}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.day}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.month}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.week}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.year}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueString}}</span>
-            </td>
-          </tbody>
-        </table>
-      </div>
-      <CrontabResult :ex="crontabValueString"></CrontabResult>
+		<div class="popup-main">
+			<div class="popup-result">
+				<p class="title">时间表达式</p>
+				<table>
+					<thead>
+					<th v-for="item of tabTitles" width="40" :key="item">{{ item }}</th>
+					<th>Cron 表达式</th>
+					</thead>
+					<tbody>
+					<td>
+						<span>{{ crontabValueObj.second }}</span>
+					</td>
+					<td>
+						<span>{{ crontabValueObj.min }}</span>
+					</td>
+					<td>
+						<span>{{ crontabValueObj.hour }}</span>
+					</td>
+					<td>
+						<span>{{ crontabValueObj.day }}</span>
+					</td>
+					<td>
+						<span>{{ crontabValueObj.month }}</span>
+					</td>
+					<td>
+						<span>{{ crontabValueObj.week }}</span>
+					</td>
+					<td>
+						<span>{{ crontabValueObj.year }}</span>
+					</td>
+					<td>
+						<span>{{ crontabValueString }}</span>
+					</td>
+					</tbody>
+				</table>
+			</div>
+			<CrontabResult :ex="crontabValueString"></CrontabResult>
 
-      <div class="pop_btn">
-        <el-button size="small" type="primary" @click="submitFill">确定</el-button>
-        <el-button size="small" type="warning" @click="clearCron">重置</el-button>
-        <el-button size="small" @click="hidePopup">取消</el-button>
-      </div>
-    </div>
-  </div>
+			<div class="pop_btn">
+				<el-button size="small" type="primary" @click="submitFill">确定</el-button>
+				<el-button size="small" type="warning" @click="clearCron">重置</el-button>
+				<el-button size="small" @click="hidePopup">取消</el-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
@@ -118,308 +118,315 @@ import CrontabYear from "./year.vue";
 import CrontabResult from "./result.vue";
 
 export default {
-  data() {
-    return {
-      tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],
-      tabActive: 0,
-      myindex: 0,
-      crontabValueObj: {
-        second: "*",
-        min: "*",
-        hour: "*",
-        day: "*",
-        month: "*",
-        week: "?",
-        year: "",
-      },
-    };
-  },
-  name: "vcrontab",
-  props: ["expression", "hideComponent"],
-  methods: {
-    shouldHide(key) {
-      if (this.hideComponent && this.hideComponent.includes(key)) return false;
-      return true;
-    },
-    resolveExp() {
-      // 反解析 表达式
-      if (this.expression) {
-        let arr = this.expression.split(" ");
-        if (arr.length >= 6) {
-          //6 位以上是合法表达式
-          let obj = {
-            second: arr[0],
-            min: arr[1],
-            hour: arr[2],
-            day: arr[3],
-            month: arr[4],
-            week: arr[5],
-            year: arr[6] ? arr[6] : "",
-          };
-          this.crontabValueObj = {
-            ...obj,
-          };
-          for (let i in obj) {
-            if (obj[i]) this.changeRadio(i, obj[i]);
-          }
-        }
-      } else {
-        // 没有传入的表达式 则还原
-        this.clearCron();
-      }
-    },
-    // tab切换值
-    tabCheck(index) {
-      this.tabActive = index;
-    },
-    // 由子组件触发，更改表达式组成的字段值
-    updateCrontabValue(name, value, from) {
-      "updateCrontabValue", name, value, from;
-      this.crontabValueObj[name] = value;
-      if (from && from !== name) {
-        console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
-        this.changeRadio(name, value);
-      }
-    },
-    // 赋值到组件
-    changeRadio(name, value) {
-      let arr = ["second", "min", "hour", "month"],
-        refName = "cron" + name,
-        insValue;
+	data() {
+		return {
+			tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],
+			tabActive: 0,
+			myindex: 0,
+			crontabValueObj: {
+				second: "*",
+				min: "*",
+				hour: "*",
+				day: "*",
+				month: "*",
+				week: "?",
+				year: "",
+			},
+		};
+	},
+	name: "vcrontab",
+	props: ["expression", "hideComponent"],
+	methods: {
+		shouldHide(key) {
+			if (this.hideComponent && this.hideComponent.includes(key)) return false;
+			return true;
+		},
+		resolveExp() {
+			// 反解析 表达式
+			if (this.expression) {
+				let arr = this.expression.split(" ");
+				if (arr.length >= 6) {
+					//6 位以上是合法表达式
+					let obj = {
+						second: arr[0],
+						min: arr[1],
+						hour: arr[2],
+						day: arr[3],
+						month: arr[4],
+						week: arr[5],
+						year: arr[6] ? arr[6] : "",
+					};
+					this.crontabValueObj = {
+						...obj,
+					};
+					for (let i in obj) {
+						if (obj[i]) this.changeRadio(i, obj[i]);
+					}
+				}
+			} else {
+				// 没有传入的表达式 则还原
+				this.clearCron();
+			}
+		},
+		// tab切换值
+		tabCheck(index) {
+			this.tabActive = index;
+		},
+		// 由子组件触发，更改表达式组成的字段值
+		updateCrontabValue(name, value, from) {
+			"updateCrontabValue", name, value, from;
+			this.crontabValueObj[name] = value;
+			if (from && from !== name) {
+				console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
+				this.changeRadio(name, value);
+			}
+		},
+		// 赋值到组件
+		changeRadio(name, value) {
+			let arr = ["second", "min", "hour", "month"],
+				refName = "cron" + name,
+				insValue;
 
-      if (!this.$refs[refName]) return;
-
-      if (arr.includes(name)) {
-        if (value === "*") {
-          insValue = 1;
-        } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 2;
-        } else if (value.indexOf("/") > -1) {
-          let indexArr = value.split("/");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].average01 = 0)
-            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1];
-          insValue = 3;
-        } else {
-          insValue = 4;
-          this.$refs[refName].checkboxList = value.split(",");
-        }
-      } else if (name == "day") {
-        if (value === "*") {
-          insValue = 1;
-        } else if (value == "?") {
-          insValue = 2;
-        } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 3;
-        } else if (value.indexOf("/") > -1) {
-          let indexArr = value.split("/");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].average01 = 0)
-            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1];
-          insValue = 4;
-        } else if (value.indexOf("W") > -1) {
-          let indexArr = value.split("W");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].workday = 0)
-            : (this.$refs[refName].workday = indexArr[0]);
-          insValue = 5;
-        } else if (value === "L") {
-          insValue = 6;
-        } else {
-          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 7;
-        }
-      } else if (name == "week") {
-        if (value === "*") {
-          insValue = 1;
-        } else if (value == "?") {
-          insValue = 2;
-        } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 3;
-        } else if (value.indexOf("#") > -1) {
-          let indexArr = value.split("#");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].average01 = 1)
-            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1];
-          insValue = 4;
-        } else if (value.indexOf("L") > -1) {
-          let indexArr = value.split("L");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].weekday = 1)
-            : (this.$refs[refName].weekday = indexArr[0]);
-          insValue = 5;
-        } else {
-          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 7;
-        }
-      } else if (name == "year") {
-        if (value == "") {
-          insValue = 1;
-        } else if (value == "*") {
-          insValue = 2;
-        } else if (value.indexOf("-") > -1) {
-          insValue = 3;
-        } else if (value.indexOf("/") > -1) {
-          insValue = 4;
-        } else {
-          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 5;
-        }
-      }
-      this.$refs[refName].radioValue = insValue;
-    },
-    // 表单选项的子组件校验数字格式（通过-props传递）
-    checkNumber(value, minLimit, maxLimit) {
-      // 检查必须为整数
-      value = Math.floor(value);
-      if (value < minLimit) {
-        value = minLimit;
-      } else if (value > maxLimit) {
-        value = maxLimit;
-      }
-      return value;
-    },
-    // 隐藏弹窗
-    hidePopup() {
-      this.$emit("hide");
-    },
-    // 填充表达式
-    submitFill() {
-      this.$emit("fill", this.crontabValueString);
-      this.hidePopup();
-    },
-    clearCron() {
-      // 还原选择项
-      ("准备还原");
-      this.crontabValueObj = {
-        second: "*",
-        min: "*",
-        hour: "*",
-        day: "*",
-        month: "*",
-        week: "?",
-        year: "",
-      };
-      for (let j in this.crontabValueObj) {
-        this.changeRadio(j, this.crontabValueObj[j]);
-      }
-    },
-  },
-  computed: {
-    crontabValueString: function() {
-      let obj = this.crontabValueObj;
-      let str =
-        obj.second +
-        " " +
-        obj.min +
-        " " +
-        obj.hour +
-        " " +
-        obj.day +
-        " " +
-        obj.month +
-        " " +
-        obj.week +
-        (obj.year == "" ? "" : " " + obj.year);
-      return str;
-    },
-  },
-  components: {
-    CrontabSecond,
-    CrontabMin,
-    CrontabHour,
-    CrontabDay,
-    CrontabMonth,
-    CrontabWeek,
-    CrontabYear,
-    CrontabResult,
-  },
-  watch: {
-    expression: "resolveExp",
-    hideComponent(value) {
-      // 隐藏部分组件
-    },
-  },
-  mounted: function() {
-    this.resolveExp();
-  },
+			if (!this.$refs[refName]) return;
+			this.$refs[refName].init()
+			if (arr.includes(name)) {
+				if (value === "*") {
+					insValue = 1;
+				} else if (value.indexOf("-") > -1) {
+					let indexArr = value.split("-");
+					isNaN(indexArr[0])
+						? (this.$refs[refName].cycle01 = 0)
+						: (this.$refs[refName].cycle01 = indexArr[0]);
+					this.$refs[refName].cycle02 = indexArr[1];
+					insValue = 2;
+				} else if (value.indexOf("/") > -1) {
+					let indexArr = value.split("/");
+					isNaN(indexArr[0])
+						? (this.$refs[refName].average01 = 0)
+						: (this.$refs[refName].average01 = indexArr[0]);
+					this.$refs[refName].average02 = indexArr[1];
+					insValue = 3;
+				} else {
+					insValue = 4;
+					this.$refs[refName].checkboxList = value.split(",");
+				}
+			} else if (name == "day") {
+				if (value === "*") {
+					insValue = 1;
+				} else if (value == "?") {
+					insValue = 2;
+				} else if (value.indexOf("-") > -1) {
+					let indexArr = value.split("-");
+					isNaN(indexArr[0])
+						? (this.$refs[refName].cycle01 = 0)
+						: (this.$refs[refName].cycle01 = indexArr[0]);
+					this.$refs[refName].cycle02 = indexArr[1];
+					insValue = 3;
+				} else if (value.indexOf("/") > -1) {
+					let indexArr = value.split("/");
+					isNaN(indexArr[0])
+						? (this.$refs[refName].average01 = 0)
+						: (this.$refs[refName].average01 = indexArr[0]);
+					this.$refs[refName].average02 = indexArr[1];
+					insValue = 4;
+				} else if (value.indexOf("W") > -1) {
+					let indexArr = value.split("W");
+					isNaN(indexArr[0])
+						? (this.$refs[refName].workday = 0)
+						: (this.$refs[refName].workday = indexArr[0]);
+					insValue = 5;
+				} else if (value === "L") {
+					insValue = 6;
+				} else {
+					this.$refs[refName].checkboxList = value.split(",");
+					insValue = 7;
+				}
+			} else if (name == "week") {
+				if (value === "*") {
+					insValue = 1;
+				} else if (value == "?") {
+					insValue = 2;
+				} else if (value.indexOf("-") > -1) {
+					let indexArr = value.split("-");
+					isNaN(indexArr[0])
+						? (this.$refs[refName].cycle01 = 0)
+						: (this.$refs[refName].cycle01 = indexArr[0]);
+					this.$refs[refName].cycle02 = indexArr[1];
+					insValue = 3;
+				} else if (value.indexOf("#") > -1) {
+					let indexArr = value.split("#");
+					isNaN(indexArr[0])
+						? (this.$refs[refName].average01 = 1)
+						: (this.$refs[refName].average01 = indexArr[0]);
+					this.$refs[refName].average02 = indexArr[1];
+					insValue = 4;
+				} else if (value.indexOf("L") > -1) {
+					let indexArr = value.split("L");
+					isNaN(indexArr[0])
+						? (this.$refs[refName].weekday = 1)
+						: (this.$refs[refName].weekday = indexArr[0]);
+					insValue = 5;
+				} else {
+					this.$refs[refName].checkboxList = value.split(",");
+					insValue = 7;
+				}
+			} else if (name == "year") {
+				if (value == "") {
+					insValue = 1;
+				} else if (value == "*") {
+					insValue = 2;
+				} else if (value.indexOf("-") > -1) {
+					insValue = 3;
+				} else if (value.indexOf("/") > -1) {
+					insValue = 4;
+				} else {
+					this.$refs[refName].checkboxList = value.split(",");
+					insValue = 5;
+				}
+			}
+			this.$refs[refName].radioValue = insValue;
+		},
+		// 表单选项的子组件校验数字格式（通过-props传递）
+		checkNumber(value, minLimit, maxLimit) {
+			// 检查必须为整数
+			value = Math.floor(value);
+			if (value < minLimit) {
+				value = minLimit;
+			} else if (value > maxLimit) {
+				value = maxLimit;
+			}
+			return value;
+		},
+		// 隐藏弹窗
+		hidePopup() {
+			this.$emit("hide");
+		},
+		// 填充表达式
+		submitFill() {
+			this.$emit("fill", this.crontabValueString);
+			this.hidePopup();
+		},
+		clearCron() {
+			// 还原选择项
+			("准备还原");
+			this.crontabValueObj = {
+				second: "*",
+				min: "*",
+				hour: "*",
+				day: "*",
+				month: "*",
+				week: "?",
+				year: "",
+			};
+			for (let j in this.crontabValueObj) {
+				this.changeRadio(j, this.crontabValueObj[j]);
+			}
+		},
+	},
+	computed: {
+		crontabValueString: function () {
+			let obj = this.crontabValueObj;
+			let str =
+				obj.second +
+				" " +
+				obj.min +
+				" " +
+				obj.hour +
+				" " +
+				obj.day +
+				" " +
+				obj.month +
+				" " +
+				obj.week +
+				(obj.year == "" ? "" : " " + obj.year);
+			return str;
+		},
+	},
+	components: {
+		CrontabSecond,
+		CrontabMin,
+		CrontabHour,
+		CrontabDay,
+		CrontabMonth,
+		CrontabWeek,
+		CrontabYear,
+		CrontabResult,
+	},
+	watch: {
+		expression: "resolveExp",
+		hideComponent(value) {
+			// 隐藏部分组件
+		},
+	},
+	mounted: function () {
+		this.resolveExp();
+	},
 };
 </script>
 <style scoped>
 .pop_btn {
-  text-align: center;
-  margin-top: 20px;
+	text-align: center;
+	margin-top: 20px;
 }
+
 .popup-main {
-  position: relative;
-  margin: 10px auto;
-  background: #fff;
-  border-radius: 5px;
-  font-size: 12px;
-  overflow: hidden;
+	position: relative;
+	margin: 10px auto;
+	background: #fff;
+	border-radius: 5px;
+	font-size: 12px;
+	overflow: hidden;
 }
+
 .popup-title {
-  overflow: hidden;
-  line-height: 34px;
-  padding-top: 6px;
-  background: #f2f2f2;
+	overflow: hidden;
+	line-height: 34px;
+	padding-top: 6px;
+	background: #f2f2f2;
 }
+
 .popup-result {
-  box-sizing: border-box;
-  line-height: 24px;
-  margin: 25px auto;
-  padding: 15px 10px 10px;
-  border: 1px solid #ccc;
-  position: relative;
+	box-sizing: border-box;
+	line-height: 24px;
+	margin: 25px auto;
+	padding: 15px 10px 10px;
+	border: 1px solid #ccc;
+	position: relative;
 }
+
 .popup-result .title {
-  position: absolute;
-  top: -28px;
-  left: 50%;
-  width: 140px;
-  font-size: 14px;
-  margin-left: -70px;
-  text-align: center;
-  line-height: 30px;
-  background: #fff;
+	position: absolute;
+	top: -28px;
+	left: 50%;
+	width: 140px;
+	font-size: 14px;
+	margin-left: -70px;
+	text-align: center;
+	line-height: 30px;
+	background: #fff;
 }
+
 .popup-result table {
-  text-align: center;
-  width: 100%;
-  margin: 0 auto;
+	text-align: center;
+	width: 100%;
+	margin: 0 auto;
 }
+
 .popup-result table span {
-  display: block;
-  width: 100%;
-  font-family: arial;
-  line-height: 30px;
-  height: 30px;
-  white-space: nowrap;
-  overflow: hidden;
-  border: 1px solid #e8e8e8;
+	display: block;
+	width: 100%;
+	font-family: arial;
+	line-height: 30px;
+	height: 30px;
+	white-space: nowrap;
+	overflow: hidden;
+	border: 1px solid #e8e8e8;
 }
+
 .popup-result-scroll {
-  font-size: 12px;
-  line-height: 24px;
-  height: 10em;
-  overflow-y: auto;
+	font-size: 12px;
+	line-height: 24px;
+	height: 10em;
+	overflow-y: auto;
 }
 </style>
diff --git a/ruoyi-ui/src/components/Crontab/min.vue b/ruoyi-ui/src/components/Crontab/min.vue
index 980c4e768..41d7bb19b 100644
--- a/ruoyi-ui/src/components/Crontab/min.vue
+++ b/ruoyi-ui/src/components/Crontab/min.vue
@@ -1,120 +1,124 @@
-<template>
-	<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="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>
-
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			radioValue: 1,
-			cycle01: 1,
-			cycle02: 2,
-			average01: 0,
-			average02: 1,
-			checkboxList: [],
-			checkNum: this.$options.propsData.check
-		}
-	},
-	name: 'crontab-min',
-	props: ['check', 'cron'],
-	methods: {
-		// 单选按钮值变化时
-		radioChange() {
-			if (this.radioValue !== 1 && this.cron.second === '*') {
-				this.$emit('update', 'second', '0', 'min');
-			}
-			switch (this.radioValue) {
-				case 1:
-					this.$emit('update', 'min', '*', 'min');
-					this.$emit('update', 'hour', '*', 'min');
-					break;
-				case 2:
-					this.$emit('update', 'min', this.cycle01 + '-' + this.cycle02, 'min');
-					break;
-				case 3:
-					this.$emit('update', 'min', this.average01 + '/' + this.average02, 'min');
-					break;
-				case 4:
-					this.$emit('update', 'min', this.checkboxString, 'min');
-					break;
-			}
-		},
-		// 周期两个值变化时
-		cycleChange() {
-			if (this.radioValue == '2') {
-				this.$emit('update', 'min', this.cycleTotal, 'min');
-			}
-		},
-		// 平均两个值变化时
-		averageChange() {
-			if (this.radioValue == '3') {
-				this.$emit('update', 'min', this.averageTotal, 'min');
-			}
-		},
-		// checkbox值变化时
-		checkboxChange() {
-			if (this.radioValue == '4') {
-				this.$emit('update', 'min', this.checkboxString, 'min');
-			}
-		},
-
-	},
-	watch: {
-		"radioValue": "radioChange",
-		'cycleTotal': 'cycleChange',
-		'averageTotal': 'averageChange',
-		'checkboxString': 'checkboxChange',
-	},
-	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>
\ No newline at end of file
+<template>
+	<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="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>
+
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			radioValue: 1,
+			cycle01: 1,
+			cycle02: 2,
+			average01: 0,
+			average02: 1,
+			checkboxList: [],
+			checkNum: this.$options.propsData.check
+		}
+	},
+	name: 'crontab-min',
+	props: ['check', 'cron'],
+	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', 'min', '*', 'min');
+					this.$emit('update', 'hour', '*', 'min');
+					break;
+				case 2:
+					this.$emit('update', 'min', this.cycle01 + '-' + this.cycle02, 'min');
+					break;
+				case 3:
+					this.$emit('update', 'min', this.average01 + '/' + this.average02, 'min');
+					break;
+				case 4:
+					this.$emit('update', 'min', this.checkboxString, 'min');
+					break;
+			}
+		},
+		// 周期两个值变化时
+		cycleChange() {
+			if (this.radioValue == '2') {
+				this.$emit('update', 'min', this.cycleTotal, 'min');
+			}
+		},
+		// 平均两个值变化时
+		averageChange() {
+			if (this.radioValue == '3') {
+				this.$emit('update', 'min', this.averageTotal, 'min');
+			}
+		},
+		// checkbox值变化时
+		checkboxChange() {
+			if (this.radioValue == '4') {
+				this.$emit('update', 'min', this.checkboxString, 'min');
+			}
+		},
+
+	},
+	watch: {
+		"radioValue": "radioChange",
+		'cycleTotal': 'cycleChange',
+		'averageTotal': 'averageChange',
+		'checkboxString': 'checkboxChange',
+	},
+	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/month.vue b/ruoyi-ui/src/components/Crontab/month.vue
index 619d1e791..1ebcb3b97 100644
--- a/ruoyi-ui/src/components/Crontab/month.vue
+++ b/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:
diff --git a/ruoyi-ui/src/components/Crontab/second.vue b/ruoyi-ui/src/components/Crontab/second.vue
index 0fdf3386d..60bda69b2 100644
--- a/ruoyi-ui/src/components/Crontab/second.vue
+++ b/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);
diff --git a/ruoyi-ui/src/components/Crontab/week.vue b/ruoyi-ui/src/components/Crontab/week.vue
index 5ad949d6b..fda5fa4d8 100644
--- a/ruoyi-ui/src/components/Crontab/week.vue
+++ b/ruoyi-ui/src/components/Crontab/week.vue
@@ -1,167 +1,178 @@
 <template>
-	<el-form size='small'>
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="1">
-				周，允许的通配符[, - * / L #]
-			</el-radio>
-		</el-form-item>
+  <el-form size='small'>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        周，允许的通配符[, - * / L #]
+      </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="1" :max="7" /> -
-				<el-input-number v-model='cycle02' :min="1" :max="7" />
-			</el-radio>
-		</el-form-item>
+    <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='cycle02' :min="1" :max="7"/>
+      </el-radio>
+    </el-form-item>
 
-		<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='average02' :min="1" :max="7" />
-			</el-radio>
-		</el-form-item>
+    <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='average02' :min="1" :max="7"/>
+      </el-radio>
+    </el-form-item>
 
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="5">
-				本月最后一个星期
-				<el-input-number v-model='weekday' :min="1" :max="7" />
-			</el-radio>
-		</el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="5">
+        本月最后一个星期
+        <el-input-number v-model='weekday' :min="1" :max="7"/>
+      </el-radio>
+    </el-form-item>
 
-		<el-form-item>
-			<el-radio v-model='radioValue' :label="6">
-				指定
-				<el-select clearable v-model="checkboxList" 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>
-		</el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="6">
+        指定
+        <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>
+    </el-form-item>
 
-	</el-form>
+  </el-form>
 </template>
 
 <script>
 export default {
-	data() {
-		return {
-			radioValue: 2,
-			weekday: 1,
-			cycle01: 1,
-			cycle02: 2,
-			average01: 1,
-			average02: 1,
-			checkboxList: [],
-			weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-			checkNum: this.$options.propsData.check
-		}
-	},
-	name: 'crontab-week',
-	props: ['check', 'cron'],
-	methods: {
-		// 单选按钮值变化时
-		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:
-					this.$emit('update', 'week', '?');
-					break;
-				case 3:
-					this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
-					break;
-				case 4:
-					this.$emit('update', 'week', this.average01 + '#' + this.average02);
-					break;
-				case 5:
-					this.$emit('update', 'week', this.weekday + 'L');
-					break;
-				case 6:
-					this.$emit('update', 'week', this.checkboxString);
-					break;
-			}
-		},
-		// 根据互斥事件，更改radio的值
+  data() {
+    return {
+      radioValue: 2,
+      weekday: 1,
+      cycle01: 1,
+      cycle02: 2,
+      average01: 1,
+      average02: 1,
+      checkboxList: [],
+      checkboxDescribeList: [],
+      weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
+      checkNum: this.$options.propsData.check
+    }
+  },
+  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() {
 
-		// 周期两个值变化时
-		cycleChange() {
-			if (this.radioValue == '3') {
-				this.$emit('update', 'week', this.cycleTotal);
-			}
-		},
-		// 平均两个值变化时
-		averageChange() {
-			if (this.radioValue == '4') {
-				this.$emit('update', 'week', this.averageTotal);
-			}
-		},
-		// 最近工作日值变化时
-		weekdayChange() {
-			if (this.radioValue == '5') {
-				this.$emit('update', 'week', this.weekday + 'L');
-			}
-		},
-		// checkbox值变化时
-		checkboxChange() {
-			if (this.radioValue == '6') {
-				this.$emit('update', 'week', this.checkboxString);
-			}
-		},
-	},
-	watch: {
-		"radioValue": "radioChange",
-		'cycleTotal': 'cycleChange',
-		'averageTotal': 'averageChange',
-		'weekdayCheck': 'weekdayChange',
-		'checkboxString': 'checkboxChange',
-	},
-	computed: {
-		// 计算两个周期值
-		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 1, 7)
-			this.cycle02 = this.checkNum(this.cycle02, 1, 7)
-			return this.cycle01 + '-' + this.cycle02;
-		},
-		// 计算平均用到的值
-		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 1, 4)
-			this.average02 = this.checkNum(this.average02, 1, 7)
-			return this.average01 + '#' + this.average02;
-		},
-		// 最近的工作日（格式）
-		weekdayCheck: function () {
-			this.weekday = this.checkNum(this.weekday, 1, 7)
-			return this.weekday;
-		},
-		// 计算勾选的checkbox值合集
-		checkboxString: function () {
-			let str = this.checkboxList.join();
-			return str == '' ? '*' : str;
-		}
-	}
+
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'week', '*');
+          break;
+        case 3:
+          this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
+          break;
+        case 4:
+          this.$emit('update', 'week', this.average01 + '#' + this.average02);
+          break;
+        case 5:
+          this.$emit('update', 'week', this.weekday + 'L');
+          break;
+        case 6:
+          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的值
+
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'week', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'week', this.averageTotal);
+      }
+    },
+    // 最近工作日值变化时
+    weekdayChange() {
+      if (this.radioValue == '5') {
+        this.$emit('update', 'week', this.weekday + 'L');
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '6') {
+        this.$emit('update', 'week', this.checkboxString);
+      }
+    },
+  },
+  watch: {
+    "radioValue": "radioChange",
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'weekdayCheck': 'weekdayChange',
+    'checkboxString': 'checkboxChange',
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      this.cycle01 = this.checkNum(this.cycle01, 1, 7)
+      this.cycle02 = this.checkNum(this.cycle02, 1, 7)
+      return this.cycle01 + '-' + this.cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      this.average01 = this.checkNum(this.average01, 1, 4)
+      this.average02 = this.checkNum(this.average02, 1, 7)
+      return this.average01 + '#' + this.average02;
+    },
+    // 最近的工作日（格式）
+    weekdayCheck: function () {
+      this.weekday = this.checkNum(this.weekday, 1, 7)
+      return this.weekday;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
 }
 </script>
diff --git a/ruoyi-ui/src/components/Crontab/year.vue b/ruoyi-ui/src/components/Crontab/year.vue
index 800dfa522..fe0216ef5 100644
--- a/ruoyi-ui/src/components/Crontab/year.vue
+++ b/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', '');

From cbae45c7cea1c41091aceafcac324340b9b7aa74 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 4 Oct 2021 10:28:13 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7element-ui=E5=88=B0?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC2.15.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml               | 4 ++--
 ruoyi-ui/package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e1d5e075..c1d9a291c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
         <druid.version>1.2.6</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
-		<kaptcha.version>2.3.2</kaptcha.version>
-		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
+        <kaptcha.version>2.3.2</kaptcha.version>
+        <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
         <fastjson.version>1.2.78</fastjson.version>
         <oshi.version>5.8.0</oshi.version>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index c7db2d8ed..034e0642d 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -41,7 +41,7 @@
     "clipboard": "2.0.6",
     "core-js": "3.8.1",
     "echarts": "4.9.0",
-    "element-ui": "2.15.5",
+    "element-ui": "2.15.6",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",

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 4/6] =?UTF-8?q?1=E3=80=81=E9=87=8D=E7=BD=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=9C=80=E8=A6=81=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E9=87=8D=E7=BD=AE=E5=9B=9E=E5=A4=8D=E5=88=B0=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E7=8A=B6=E6=80=81=EF=BC=88=E9=80=89=E6=8B=A9=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6(0=200=200=200=200=201-2=20)=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=82=B9=E5=87=BB3=E6=AC=A1=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=89=8D=E8=83=BD=E9=87=8D=E7=BD=AE=E5=88=B0(=20*=20*?=
 =?UTF-8?q?=20*=20*=20=3F)=202=E3=80=81=E5=88=A0=E9=99=A4=E8=A1=A8?=
 =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=AF=8F=E4=B8=80=E9=A1=B9=E9=83=BD=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=94=A8=E6=88=B7=E8=87=AA=E8=A1=8C=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=94=AF=E6=8C=81=E8=87=AA=E5=8A=A8=E4=BF=AE?=
 =?UTF-8?q?=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', '*');

From 730151b13fb6ae5c426039868a7566cfd9fc3b96 Mon Sep 17 00:00:00 2001
From: yjb <yjb@greenism.net>
Date: Sat, 23 Oct 2021 23:37:21 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=A8=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E6=97=B6=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E5=8F=8A?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E6=95=B0=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/Crontab/week.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/components/Crontab/week.vue b/ruoyi-ui/src/components/Crontab/week.vue
index f42fb60ad..377fa4006 100644
--- a/ruoyi-ui/src/components/Crontab/week.vue
+++ b/ruoyi-ui/src/components/Crontab/week.vue
@@ -42,7 +42,7 @@
         指定
         <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-option v-for="(item,index) of weekList" :key="index" :value="item">{{ item }}</el-option>
         </el-select>
       </el-radio>
     </el-form-item>
@@ -70,15 +70,11 @@ export default {
   props: ['check', 'cron'],
   methods: {
     selectChange(data) {
-      console.log(data);
       this.radioValue = 6
       this.checkboxList = []
-      this.checkboxDescribeList = []
       data.forEach(value => {
         this.weekList.forEach((item,index) => {
-          if (index+1 === value) {
-            console.log((item));
-            this.checkboxDescribeList.push(this.weekList[index])
+          if (item === value) {
             this.checkboxList.push(index + 1)
           }
         })

From f5f9685685ceac340a0a2152e0be8b8bef64bfbb Mon Sep 17 00:00:00 2001
From: yjb <yjb@greenism.net>
Date: Sat, 23 Oct 2021 23:50:18 +0800
Subject: [PATCH 6/6] =?UTF-8?q?https://gitee.com/y=5Fproject/RuoYi-Vue/iss?=
 =?UTF-8?q?ues/I3YMWW=20=E9=83=A8=E7=BD=B2=E8=AE=BE=E7=BD=AE=E4=B8=ADHead?=
 =?UTF-8?q?=E5=A4=B4=E5=9B=BA=E5=AE=9A=E5=90=8E=EF=BC=8C=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?el-dialoger=EF=BC=8Cheader=E5=A4=B4=E9=83=A8=E4=BC=9A=E5=90=91?=
 =?UTF-8?q?=E5=8F=B3=E5=81=8F=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/layout/index.vue | 215 +++++++++++++++++-----------------
 1 file changed, 108 insertions(+), 107 deletions(-)

diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index 718723ea4..31b01971f 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -1,107 +1,108 @@
-<template>
-  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <sidebar class="sidebar-container"/>
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
-        <navbar />
-        <tags-view v-if="needTagsView" />
-      </div>
-      <app-main />
-      <right-panel>
-        <settings />
-      </right-panel>
-    </div>
-  </div>
-</template>
-
-<script>
-import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
-import variables from '@/assets/styles/variables.scss'
-
-export default {
-  name: 'Layout',
-  components: {
-    AppMain,
-    Navbar,
-    RightPanel,
-    Settings,
-    Sidebar,
-    TagsView
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    ...mapState({
-      theme: state => state.settings.theme,
-      sideTheme: state => state.settings.sideTheme,
-      sidebar: state => state.app.sidebar,
-      device: state => state.app.device,
-      needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
-    }),
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    },
-    variables() {
-      return variables;
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
-
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .fixed-header {
-    position: fixed;
-    top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$base-sidebar-width});
-    transition: width 0.28s;
-  }
-
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
-
-  .mobile .fixed-header {
-    width: 100%;
-  }
-</style>
+<template>
+  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
+    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+    <sidebar class="sidebar-container"/>
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+      <div :class="{'fixed-header':fixedHeader}">
+        <navbar />
+        <tags-view v-if="needTagsView" />
+      </div>
+      <app-main />
+      <right-panel>
+        <settings />
+      </right-panel>
+    </div>
+  </div>
+</template>
+
+<script>
+import RightPanel from '@/components/RightPanel'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
+import variables from '@/assets/styles/variables.scss'
+
+export default {
+  name: 'Layout',
+  components: {
+    AppMain,
+    Navbar,
+    RightPanel,
+    Settings,
+    Sidebar,
+    TagsView
+  },
+  mixins: [ResizeMixin],
+  computed: {
+    ...mapState({
+      theme: state => state.settings.theme,
+      sideTheme: state => state.settings.sideTheme,
+      sidebar: state => state.app.sidebar,
+      device: state => state.app.device,
+      needTagsView: state => state.settings.tagsView,
+      fixedHeader: state => state.settings.fixedHeader
+    }),
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened,
+        withoutAnimation: this.sidebar.withoutAnimation,
+        mobile: this.device === 'mobile'
+      }
+    },
+    variables() {
+      return variables;
+    }
+  },
+  methods: {
+    handleClickOutside() {
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
+
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
+
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
+  }
+
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
+
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$base-sidebar-width});
+    transition: width 0.28s;
+    padding-right: 0;
+  }
+
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
+
+  .mobile .fixed-header {
+    width: 100%;
+  }
+</style>