From 965bdc9986ba66b10c2783b514b1cbdd19b29077 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 19 二月 2022 17:08:50 +0800
Subject: [PATCH] !431 修改登录超时刷新页面跳转登录页面还提示重新登录问题 Merge pull request !431 from 也曾为你、像超人/master
---
ruoyi-ui/src/components/Crontab/week.vue | 369 ++++++++++++++++++++++++++++-----------------------
1 files changed, 202 insertions(+), 167 deletions(-)
diff --git a/ruoyi-ui/src/components/Crontab/week.vue b/ruoyi-ui/src/components/Crontab/week.vue
index 8a7cb6b..1cec700 100644
--- a/ruoyi-ui/src/components/Crontab/week.vue
+++ b/ruoyi-ui/src/components/Crontab/week.vue
@@ -1,167 +1,202 @@
-<template>
- <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="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="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>
-</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.mouth === '*') {
- this.$emit('update', 'mouth', '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的值
-
- // 周期两个值变化时
- 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>
\ No newline at end of file
+<template>
+ <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="3">
+ 周期从星期
+ <el-select clearable v-model="cycle01">
+ <el-option
+ v-for="(item,index) of weekList"
+ :key="index"
+ :label="item.value"
+ :value="item.key"
+ :disabled="item.key === 1"
+ >{{item.value}}</el-option>
+ </el-select>
+ -
+ <el-select clearable v-model="cycle02">
+ <el-option
+ v-for="(item,index) of weekList"
+ :key="index"
+ :label="item.value"
+ :value="item.key"
+ :disabled="item.key < cycle01 && item.key !== 1"
+ >{{item.value}}</el-option>
+ </el-select>
+ </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-select clearable v-model="average02">
+ <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
+ </el-select>
+ </el-radio>
+ </el-form-item>
+
+ <el-form-item>
+ <el-radio v-model='radioValue' :label="5">
+ 本月最后一个星期
+ <el-select clearable v-model="weekday">
+ <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
+ </el-select>
+ </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" :label="item.value" :value="String(item.key)">{{item.value}}</el-option>
+ </el-select>
+ </el-radio>
+ </el-form-item>
+
+ </el-form>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ radioValue: 2,
+ weekday: 2,
+ cycle01: 2,
+ cycle02: 3,
+ average01: 1,
+ average02: 2,
+ checkboxList: [],
+ weekList: [
+ {
+ key: 2,
+ value: '星期一'
+ },
+ {
+ key: 3,
+ value: '星期二'
+ },
+ {
+ key: 4,
+ value: '星期三'
+ },
+ {
+ key: 5,
+ value: '星期四'
+ },
+ {
+ key: 6,
+ value: '星期五'
+ },
+ {
+ key: 7,
+ value: '星期六'
+ },
+ {
+ key: 1,
+ value: '星期日'
+ }
+ ],
+ checkNum: this.$options.propsData.check
+ }
+ },
+ name: 'crontab-week',
+ props: ['check', 'cron'],
+ methods: {
+ // 单选按钮值变化时
+ radioChange() {
+ if (this.radioValue !== 2 && this.cron.day !== '?') {
+ this.$emit('update', 'day', '?', 'week');
+ }
+ switch (this.radioValue) {
+ case 1:
+ this.$emit('update', 'week', '*');
+ break;
+ case 2:
+ this.$emit('update', 'week', '?');
+ break;
+ case 3:
+ this.$emit('update', 'week', this.cycleTotal);
+ break;
+ case 4:
+ this.$emit('update', 'week', this.averageTotal);
+ break;
+ case 5:
+ this.$emit('update', 'week', this.weekdayCheck + 'L');
+ break;
+ case 6:
+ this.$emit('update', 'week', this.checkboxString);
+ break;
+ }
+ },
+
+ // 周期两个值变化时
+ 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.average02 + '#' + this.average01;
+ },
+ // 最近的工作日（格式）
+ 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>
--
Gitblit v1.9.2