From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-ui/src/components/Crontab/month.vue | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/ruoyi-ui/src/components/Crontab/month.vue b/ruoyi-ui/src/components/Crontab/month.vue
index 619d1e7..fd0ac38 100644
--- a/ruoyi-ui/src/components/Crontab/month.vue
+++ b/ruoyi-ui/src/components/Crontab/month.vue
@@ -9,16 +9,16 @@
<el-form-item>
<el-radio v-model='radioValue' :label="2">
鍛ㄦ湡浠�
- <el-input-number v-model='cycle01' :min="1" :max="12" /> -
- <el-input-number v-model='cycle02' :min="1" :max="12" /> 鏈�
+ <el-input-number v-model='cycle01' :min="1" :max="11" /> -
+ <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="12" /> 鏈�
</el-radio>
</el-form-item>
<el-form-item>
<el-radio v-model='radioValue' :label="3">
浠�
- <el-input-number v-model='average01' :min="1" :max="12" /> 鏈堝紑濮嬶紝姣�
- <el-input-number v-model='average02' :min="1" :max="12" /> 鏈堟湀鎵ц涓�娆�
+ <el-input-number v-model='average01' :min="1" :max="11" /> 鏈堝紑濮嬶紝姣�
+ <el-input-number v-model='average02' :min="1" :max="12 - average01 || 0" /> 鏈堟湀鎵ц涓�娆�
</el-radio>
</el-form-item>
@@ -51,29 +51,15 @@
methods: {
// 鍗曢�夋寜閽�煎彉鍖栨椂
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 1:
+ this.$emit('update', 'month', '*');
+ break;
case 2:
- this.$emit('update', 'month', this.cycle01 + '-' + this.cycle02);
+ this.$emit('update', 'month', this.cycleTotal);
break;
case 3:
- this.$emit('update', 'month', this.average01 + '/' + this.average02);
+ this.$emit('update', 'month', this.averageTotal);
break;
case 4:
this.$emit('update', 'month', this.checkboxString);
@@ -100,7 +86,7 @@
}
},
watch: {
- "radioValue": "radioChange",
+ 'radioValue': 'radioChange',
'cycleTotal': 'cycleChange',
'averageTotal': 'averageChange',
'checkboxString': 'checkboxChange'
@@ -108,15 +94,15 @@
computed: {
// 璁＄畻涓や釜鍛ㄦ湡鍊�
cycleTotal: function () {
- this.cycle01 = this.checkNum(this.cycle01, 1, 12)
- this.cycle02 = this.checkNum(this.cycle02, 1, 12)
- return this.cycle01 + '-' + this.cycle02;
+ const cycle01 = this.checkNum(this.cycle01, 1, 11)
+ const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 12)
+ return cycle01 + '-' + cycle02;
},
// 璁＄畻骞冲潎鐢ㄥ埌鐨勫��
averageTotal: function () {
- this.average01 = this.checkNum(this.average01, 1, 12)
- this.average02 = this.checkNum(this.average02, 1, 12)
- return this.average01 + '/' + this.average02;
+ const average01 = this.checkNum(this.average01, 1, 11)
+ const average02 = this.checkNum(this.average02, 1, 12 - average01 || 0)
+ return average01 + '/' + average02;
},
// 璁＄畻鍕鹃�夌殑checkbox鍊煎悎闆�
checkboxString: function () {
--
Gitblit v1.9.3