Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
34f2552c
Commit
34f2552c
authored
Nov 30, 2021
by
fuzui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: crontab组件互斥bug
parent
89e7cb19
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
22 additions
and
83 deletions
+22
-83
ruoyi-ui/src/components/Crontab/day.vue
ruoyi-ui/src/components/Crontab/day.vue
+5
-14
ruoyi-ui/src/components/Crontab/hour.vue
ruoyi-ui/src/components/Crontab/hour.vue
+3
-11
ruoyi-ui/src/components/Crontab/index.vue
ruoyi-ui/src/components/Crontab/index.vue
+6
-1
ruoyi-ui/src/components/Crontab/min.vue
ruoyi-ui/src/components/Crontab/min.vue
+0
-4
ruoyi-ui/src/components/Crontab/month.vue
ruoyi-ui/src/components/Crontab/month.vue
+3
-17
ruoyi-ui/src/components/Crontab/second.vue
ruoyi-ui/src/components/Crontab/second.vue
+0
-1
ruoyi-ui/src/components/Crontab/week.vue
ruoyi-ui/src/components/Crontab/week.vue
+5
-20
ruoyi-ui/src/components/Crontab/year.vue
ruoyi-ui/src/components/Crontab/year.vue
+0
-15
No files found.
ruoyi-ui/src/components/Crontab/day.vue
View file @
34f2552c
...
...
@@ -72,23 +72,14 @@ export default {
// 单选按钮值变化时
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
'
);
}
if
(
this
.
radioValue
!==
2
&&
this
.
cron
.
week
!==
'
?
'
)
{
this
.
$emit
(
'
update
'
,
'
week
'
,
'
?
'
,
'
day
'
)
}
switch
(
this
.
radioValue
)
{
case
1
:
this
.
$emit
(
'
update
'
,
'
day
'
,
'
*
'
);
break
;
case
2
:
this
.
$emit
(
'
update
'
,
'
day
'
,
'
?
'
);
break
;
...
...
ruoyi-ui/src/components/Crontab/hour.vue
View file @
34f2552c
...
...
@@ -51,18 +51,10 @@ export default {
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
1
:
this
.
$emit
(
'
update
'
,
'
hour
'
,
'
*
'
)
break
;
case
2
:
this
.
$emit
(
'
update
'
,
'
hour
'
,
this
.
cycle01
+
'
-
'
+
this
.
cycle02
);
break
;
...
...
ruoyi-ui/src/components/Crontab/index.vue
View file @
34f2552c
...
...
@@ -2,7 +2,12 @@
<div>
<el-tabs
type=
"border-card"
>
<el-tab-pane
label=
"秒"
v-if=
"shouldHide('second')"
>
<CrontabSecond
@
update=
"updateCrontabValue"
:check=
"checkNumber"
ref=
"cronsecond"
/>
<CrontabSecond
@
update=
"updateCrontabValue"
:check=
"checkNumber"
:cron=
"crontabValueObj"
ref=
"cronsecond"
/>
</el-tab-pane>
<el-tab-pane
label=
"分钟"
v-if=
"shouldHide('min')"
>
...
...
ruoyi-ui/src/components/Crontab/min.vue
View file @
34f2552c
...
...
@@ -52,13 +52,9 @@ export default {
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
'
);
...
...
ruoyi-ui/src/components/Crontab/month.vue
View file @
34f2552c
...
...
@@ -51,24 +51,10 @@ export default {
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
);
break
;
...
...
ruoyi-ui/src/components/Crontab/second.vue
View file @
34f2552c
...
...
@@ -54,7 +54,6 @@ export default {
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
);
...
...
ruoyi-ui/src/components/Crontab/week.vue
View file @
34f2552c
...
...
@@ -67,27 +67,13 @@ export default {
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
'
);
}
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
;
...
...
@@ -105,7 +91,6 @@ export default {
break
;
}
},
// 根据互斥事件,更改radio的值
// 周期两个值变化时
cycleChange
()
{
...
...
ruoyi-ui/src/components/Crontab/year.vue
View file @
34f2552c
...
...
@@ -59,21 +59,6 @@ export default {
methods
:
{
// 单选按钮值变化时
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
'
,
''
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment