From 628223d26e8c186963411c93f56d57553b026d2f Mon Sep 17 00:00:00 2001
From: "YUN-PC5\\user" <bmdzh11713@163.com>
Date: Tue, 2 Jan 2024 10:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcron=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Crontab/day.vue    | 10 ++++------
 src/components/Crontab/hour.vue   | 10 ++++------
 src/components/Crontab/min.vue    | 10 ++++------
 src/components/Crontab/month.vue  | 15 ++++++++-------
 src/components/Crontab/second.vue | 10 ++++------
 src/components/Crontab/year.vue   |  7 +++++--
 6 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/components/Crontab/day.vue b/src/components/Crontab/day.vue
index 4c82e45..66882ec 100644
--- a/src/components/Crontab/day.vue
+++ b/src/components/Crontab/day.vue
@@ -35,12 +35,10 @@
     </el-form-item>
 
     <el-form-item>
-      <el-radio v-model="radioValue" :label="7">
-        指定
-        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
-          <el-option v-for="item in 31" :key="item" :label="item" :value="item" />
-        </el-select>
-      </el-radio>
+      <el-radio v-model="radioValue" :label="7"> 指定 </el-radio>
+      <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
+        <el-option v-for="item in 31" :key="item" :label="item" :value="item" />
+      </el-select>
     </el-form-item>
   </el-form>
 </template>
diff --git a/src/components/Crontab/hour.vue b/src/components/Crontab/hour.vue
index a5839aa..6f6f533 100644
--- a/src/components/Crontab/hour.vue
+++ b/src/components/Crontab/hour.vue
@@ -20,12 +20,10 @@
     </el-form-item>
 
     <el-form-item>
-      <el-radio v-model="radioValue" :label="4">
-        指定
-        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
-          <el-option v-for="item in 24" :key="item" :label="item - 1" :value="item - 1" />
-        </el-select>
-      </el-radio>
+      <el-radio v-model="radioValue" :label="4"> 指定 </el-radio>
+      <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
+        <el-option v-for="item in 24" :key="item" :label="item - 1" :value="item - 1" />
+      </el-select>
     </el-form-item>
   </el-form>
 </template>
diff --git a/src/components/Crontab/min.vue b/src/components/Crontab/min.vue
index 1bfac91..4e2c129 100644
--- a/src/components/Crontab/min.vue
+++ b/src/components/Crontab/min.vue
@@ -20,12 +20,10 @@
     </el-form-item>
 
     <el-form-item>
-      <el-radio v-model="radioValue" :label="4">
-        指定
-        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
-          <el-option v-for="item in 60" :key="item" :label="item - 1" :value="item - 1" />
-        </el-select>
-      </el-radio>
+      <el-radio v-model="radioValue" :label="4"> 指定 </el-radio>
+      <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
+        <el-option v-for="item in 60" :key="item" :label="item - 1" :value="item - 1" />
+      </el-select>
     </el-form-item>
   </el-form>
 </template>
diff --git a/src/components/Crontab/month.vue b/src/components/Crontab/month.vue
index dd9d7ac..6d2e06f 100644
--- a/src/components/Crontab/month.vue
+++ b/src/components/Crontab/month.vue
@@ -15,17 +15,15 @@
       <el-radio v-model="radioValue" :label="3">
         从
         <el-input-number v-model="average01" :min="1" :max="11" /> 月开始，每
-        <el-input-number v-model="average02" :min="1" :max="12 - average01" /> 月月执行一次
+        <el-input-number v-model="average02" :min="1" :max="maxMonth" /> 月执行一次
       </el-radio>
     </el-form-item>
 
     <el-form-item>
-      <el-radio v-model="radioValue" :label="4">
-        指定
-        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="8">
-          <el-option v-for="item in monthList" :key="item.key" :label="item.value" :value="item.key" />
-        </el-select>
-      </el-radio>
+      <el-radio v-model="radioValue" :label="4"> 指定 </el-radio>
+      <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="8" style="width: 80%">
+        <el-option v-for="item in monthList" :key="item.key" :label="item.value" :value="item.key" />
+      </el-select>
     </el-form-item>
   </el-form>
 </template>
@@ -81,6 +79,9 @@ const averageTotal = computed(() => {
   average02.value = props.check(average02.value, 1, 12 - average01.value)
   return average01.value + '/' + average02.value
 })
+const maxMonth = computed(() => {
+  return 12 - average01.value
+})
 const checkboxString = computed(() => {
   return checkboxList.value.join(',')
 })
diff --git a/src/components/Crontab/second.vue b/src/components/Crontab/second.vue
index 99b5939..5cb3baf 100644
--- a/src/components/Crontab/second.vue
+++ b/src/components/Crontab/second.vue
@@ -20,12 +20,10 @@
     </el-form-item>
 
     <el-form-item>
-      <el-radio v-model="radioValue" :label="4">
-        指定
-        <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
-          <el-option v-for="item in 60" :key="item" :label="item - 1" :value="item - 1" />
-        </el-select>
-      </el-radio>
+      <el-radio v-model="radioValue" :label="4"> 指定 </el-radio>
+      <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
+        <el-option v-for="item in 60" :key="item" :label="item - 1" :value="item - 1" />
+      </el-select>
     </el-form-item>
   </el-form>
 </template>
diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue
index b560bb4..5a02ee6 100644
--- a/src/components/Crontab/year.vue
+++ b/src/components/Crontab/year.vue
@@ -8,7 +8,7 @@
       <el-radio :label="2" v-model="radioValue"> 每年 </el-radio>
     </el-form-item>
 
-    <el-form-item>
+    <!-- <el-form-item>
       <el-radio :label="3" v-model="radioValue">
         周期从
         <el-input-number v-model="cycle01" :min="fullYear" :max="maxFullYear - 1" /> -
@@ -22,7 +22,7 @@
         <el-input-number v-model="average01" :min="fullYear" :max="maxFullYear - 1" /> 年开始，每
         <el-input-number v-model="average02" :min="1" :max="10" /> 年执行一次
       </el-radio>
-    </el-form-item>
+    </el-form-item> -->
 
     <el-form-item>
       <el-radio :label="5" v-model="radioValue">
@@ -74,6 +74,9 @@ const averageTotal = computed(() => {
   average02.value = props.check(average02.value, 1, 10)
   return average01.value + '/' + average02.value
 })
+const maxFullYearLabel = computed(() => {
+  return maxFullYear.value - 1
+})
 const checkboxString = computed(() => {
   return checkboxList.value.join(',')
 })