Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
多鱼的夏天
RuoYi-Cloud-Docker
提交
cd4119b2
R
RuoYi-Cloud-Docker
项目概览
多鱼的夏天
/
RuoYi-Cloud-Docker
通知
210
Star
7
Fork
6
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Cloud-Docker
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd4119b2
编写于
9月 08, 2021
作者:
R
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修正单词拼写错误
上级
ea20fa3c
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
256 addition
and
256 deletion
+256
-256
ruoyi-ui/src/components/Crontab/day.vue
ruoyi-ui/src/components/Crontab/day.vue
+2
-2
ruoyi-ui/src/components/Crontab/index.vue
ruoyi-ui/src/components/Crontab/index.vue
+71
-71
ruoyi-ui/src/components/Crontab/month.vue
ruoyi-ui/src/components/Crontab/month.vue
+128
-128
ruoyi-ui/src/components/Crontab/result.vue
ruoyi-ui/src/components/Crontab/result.vue
+46
-46
ruoyi-ui/src/components/Crontab/second.vue
ruoyi-ui/src/components/Crontab/second.vue
+2
-2
ruoyi-ui/src/components/Crontab/week.vue
ruoyi-ui/src/components/Crontab/week.vue
+3
-3
ruoyi-ui/src/components/Crontab/year.vue
ruoyi-ui/src/components/Crontab/year.vue
+4
-4
未找到文件。
ruoyi-ui/src/components/Crontab/day.vue
浏览文件 @
cd4119b2
...
@@ -75,7 +75,7 @@ export default {
...
@@ -75,7 +75,7 @@ export default {
if
(
this
.
radioValue
===
1
)
{
if
(
this
.
radioValue
===
1
)
{
this
.
$emit
(
'
update
'
,
'
day
'
,
'
*
'
,
'
day
'
);
this
.
$emit
(
'
update
'
,
'
day
'
,
'
*
'
,
'
day
'
);
this
.
$emit
(
'
update
'
,
'
week
'
,
'
?
'
,
'
day
'
);
this
.
$emit
(
'
update
'
,
'
week
'
,
'
?
'
,
'
day
'
);
this
.
$emit
(
'
update
'
,
'
mo
u
th
'
,
'
*
'
,
'
day
'
);
this
.
$emit
(
'
update
'
,
'
mo
n
th
'
,
'
*
'
,
'
day
'
);
}
else
{
}
else
{
if
(
this
.
cron
.
hour
===
'
*
'
)
{
if
(
this
.
cron
.
hour
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
hour
'
,
'
0
'
,
'
day
'
);
this
.
$emit
(
'
update
'
,
'
hour
'
,
'
0
'
,
'
day
'
);
...
@@ -176,4 +176,4 @@ export default {
...
@@ -176,4 +176,4 @@ export default {
}
}
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
ruoyi-ui/src/components/Crontab/index.vue
浏览文件 @
cd4119b2
...
@@ -2,59 +2,59 @@
...
@@ -2,59 +2,59 @@
<div>
<div>
<el-tabs
type=
"border-card"
>
<el-tabs
type=
"border-card"
>
<el-tab-pane
label=
"秒"
v-if=
"shouldHide('second')"
>
<el-tab-pane
label=
"秒"
v-if=
"shouldHide('second')"
>
<CrontabSecond
@
update=
"updateContabValue"
:check=
"checkNumber"
ref=
"cronsecond"
/>
<CrontabSecond
@
update=
"updateC
r
ontabValue"
:check=
"checkNumber"
ref=
"cronsecond"
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"分钟"
v-if=
"shouldHide('min')"
>
<el-tab-pane
label=
"分钟"
v-if=
"shouldHide('min')"
>
<CrontabMin
<CrontabMin
@
update=
"updateContabValue"
@
update=
"updateC
r
ontabValue"
:check=
"checkNumber"
:check=
"checkNumber"
:cron=
"contabValueObj"
:cron=
"c
r
ontabValueObj"
ref=
"cronmin"
ref=
"cronmin"
/>
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"小时"
v-if=
"shouldHide('hour')"
>
<el-tab-pane
label=
"小时"
v-if=
"shouldHide('hour')"
>
<CrontabHour
<CrontabHour
@
update=
"updateContabValue"
@
update=
"updateC
r
ontabValue"
:check=
"checkNumber"
:check=
"checkNumber"
:cron=
"contabValueObj"
:cron=
"c
r
ontabValueObj"
ref=
"cronhour"
ref=
"cronhour"
/>
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"日"
v-if=
"shouldHide('day')"
>
<el-tab-pane
label=
"日"
v-if=
"shouldHide('day')"
>
<CrontabDay
<CrontabDay
@
update=
"updateContabValue"
@
update=
"updateC
r
ontabValue"
:check=
"checkNumber"
:check=
"checkNumber"
:cron=
"contabValueObj"
:cron=
"c
r
ontabValueObj"
ref=
"cronday"
ref=
"cronday"
/>
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"月"
v-if=
"shouldHide('mo
u
th')"
>
<el-tab-pane
label=
"月"
v-if=
"shouldHide('mo
n
th')"
>
<CrontabMo
u
th
<CrontabMo
n
th
@
update=
"updateContabValue"
@
update=
"updateC
r
ontabValue"
:check=
"checkNumber"
:check=
"checkNumber"
:cron=
"contabValueObj"
:cron=
"c
r
ontabValueObj"
ref=
"cronmo
u
th"
ref=
"cronmo
n
th"
/>
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"周"
v-if=
"shouldHide('week')"
>
<el-tab-pane
label=
"周"
v-if=
"shouldHide('week')"
>
<CrontabWeek
<CrontabWeek
@
update=
"updateContabValue"
@
update=
"updateC
r
ontabValue"
:check=
"checkNumber"
:check=
"checkNumber"
:cron=
"contabValueObj"
:cron=
"c
r
ontabValueObj"
ref=
"cronweek"
ref=
"cronweek"
/>
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"年"
v-if=
"shouldHide('year')"
>
<el-tab-pane
label=
"年"
v-if=
"shouldHide('year')"
>
<CrontabYear
<CrontabYear
@
update=
"updateContabValue"
@
update=
"updateC
r
ontabValue"
:check=
"checkNumber"
:check=
"checkNumber"
:cron=
"contabValueObj"
:cron=
"c
r
ontabValueObj"
ref=
"cronyear"
ref=
"cronyear"
/>
/>
</el-tab-pane>
</el-tab-pane>
...
@@ -70,33 +70,33 @@
...
@@ -70,33 +70,33 @@
</thead>
</thead>
<tbody>
<tbody>
<td>
<td>
<span>
{{
contabValueObj
.
second
}}
</span>
<span>
{{
c
r
ontabValueObj
.
second
}}
</span>
</td>
</td>
<td>
<td>
<span>
{{
contabValueObj
.
min
}}
</span>
<span>
{{
c
r
ontabValueObj
.
min
}}
</span>
</td>
</td>
<td>
<td>
<span>
{{
contabValueObj
.
hour
}}
</span>
<span>
{{
c
r
ontabValueObj
.
hour
}}
</span>
</td>
</td>
<td>
<td>
<span>
{{
contabValueObj
.
day
}}
</span>
<span>
{{
c
r
ontabValueObj
.
day
}}
</span>
</td>
</td>
<td>
<td>
<span>
{{
c
ontabValueObj
.
mou
th
}}
</span>
<span>
{{
c
rontabValueObj
.
mon
th
}}
</span>
</td>
</td>
<td>
<td>
<span>
{{
contabValueObj
.
week
}}
</span>
<span>
{{
c
r
ontabValueObj
.
week
}}
</span>
</td>
</td>
<td>
<td>
<span>
{{
contabValueObj
.
year
}}
</span>
<span>
{{
c
r
ontabValueObj
.
year
}}
</span>
</td>
</td>
<td>
<td>
<span>
{{
contabValueString
}}
</span>
<span>
{{
c
r
ontabValueString
}}
</span>
</td>
</td>
</tbody>
</tbody>
</table>
</table>
</div>
</div>
<CrontabResult
:ex=
"contabValueString"
></CrontabResult>
<CrontabResult
:ex=
"c
r
ontabValueString"
></CrontabResult>
<div
class=
"pop_btn"
>
<div
class=
"pop_btn"
>
<el-button
size=
"small"
type=
"primary"
@
click=
"submitFill"
>
确定
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"submitFill"
>
确定
</el-button>
...
@@ -112,7 +112,7 @@ import CrontabSecond from "./second.vue";
...
@@ -112,7 +112,7 @@ import CrontabSecond from "./second.vue";
import
CrontabMin
from
"
./min.vue
"
;
import
CrontabMin
from
"
./min.vue
"
;
import
CrontabHour
from
"
./hour.vue
"
;
import
CrontabHour
from
"
./hour.vue
"
;
import
CrontabDay
from
"
./day.vue
"
;
import
CrontabDay
from
"
./day.vue
"
;
import
CrontabMo
uth
from
"
./mou
th.vue
"
;
import
CrontabMo
nth
from
"
./mon
th.vue
"
;
import
CrontabWeek
from
"
./week.vue
"
;
import
CrontabWeek
from
"
./week.vue
"
;
import
CrontabYear
from
"
./year.vue
"
;
import
CrontabYear
from
"
./year.vue
"
;
import
CrontabResult
from
"
./result.vue
"
;
import
CrontabResult
from
"
./result.vue
"
;
...
@@ -123,12 +123,12 @@ export default {
...
@@ -123,12 +123,12 @@ export default {
tabTitles
:
[
"
秒
"
,
"
分钟
"
,
"
小时
"
,
"
日
"
,
"
月
"
,
"
周
"
,
"
年
"
],
tabTitles
:
[
"
秒
"
,
"
分钟
"
,
"
小时
"
,
"
日
"
,
"
月
"
,
"
周
"
,
"
年
"
],
tabActive
:
0
,
tabActive
:
0
,
myindex
:
0
,
myindex
:
0
,
contabValueObj
:
{
c
r
ontabValueObj
:
{
second
:
"
*
"
,
second
:
"
*
"
,
min
:
"
*
"
,
min
:
"
*
"
,
hour
:
"
*
"
,
hour
:
"
*
"
,
day
:
"
*
"
,
day
:
"
*
"
,
mo
u
th
:
"
*
"
,
mo
n
th
:
"
*
"
,
week
:
"
?
"
,
week
:
"
?
"
,
year
:
""
,
year
:
""
,
},
},
...
@@ -142,7 +142,7 @@ export default {
...
@@ -142,7 +142,7 @@ export default {
return
true
;
return
true
;
},
},
resolveExp
()
{
resolveExp
()
{
//反解析 表达式
//
反解析 表达式
if
(
this
.
expression
)
{
if
(
this
.
expression
)
{
let
arr
=
this
.
expression
.
split
(
"
"
);
let
arr
=
this
.
expression
.
split
(
"
"
);
if
(
arr
.
length
>=
6
)
{
if
(
arr
.
length
>=
6
)
{
...
@@ -152,11 +152,11 @@ export default {
...
@@ -152,11 +152,11 @@ export default {
min
:
arr
[
1
],
min
:
arr
[
1
],
hour
:
arr
[
2
],
hour
:
arr
[
2
],
day
:
arr
[
3
],
day
:
arr
[
3
],
mo
u
th
:
arr
[
4
],
mo
n
th
:
arr
[
4
],
week
:
arr
[
5
],
week
:
arr
[
5
],
year
:
arr
[
6
]
?
arr
[
6
]
:
""
,
year
:
arr
[
6
]
?
arr
[
6
]
:
""
,
};
};
this
.
contabValueObj
=
{
this
.
c
r
ontabValueObj
=
{
...
obj
,
...
obj
,
};
};
for
(
let
i
in
obj
)
{
for
(
let
i
in
obj
)
{
...
@@ -164,7 +164,7 @@ export default {
...
@@ -164,7 +164,7 @@ export default {
}
}
}
}
}
else
{
}
else
{
//没有传入的表达式 则还原
//
没有传入的表达式 则还原
this
.
clearCron
();
this
.
clearCron
();
}
}
},
},
...
@@ -173,122 +173,122 @@ export default {
...
@@ -173,122 +173,122 @@ export default {
this
.
tabActive
=
index
;
this
.
tabActive
=
index
;
},
},
// 由子组件触发,更改表达式组成的字段值
// 由子组件触发,更改表达式组成的字段值
updateContabValue
(
name
,
value
,
from
)
{
updateC
r
ontabValue
(
name
,
value
,
from
)
{
"
updateContabValue
"
,
name
,
value
,
from
;
"
updateC
r
ontabValue
"
,
name
,
value
,
from
;
this
.
contabValueObj
[
name
]
=
value
;
this
.
c
r
ontabValueObj
[
name
]
=
value
;
if
(
from
&&
from
!==
name
)
{
if
(
from
&&
from
!==
name
)
{
console
.
log
(
`来自组件
${
from
}
改变了
${
name
}
${
value
}
`
);
console
.
log
(
`来自组件
${
from
}
改变了
${
name
}
${
value
}
`
);
this
.
changeRadio
(
name
,
value
);
this
.
changeRadio
(
name
,
value
);
}
}
},
},
//赋值到组件
//
赋值到组件
changeRadio
(
name
,
value
)
{
changeRadio
(
name
,
value
)
{
let
arr
=
[
"
second
"
,
"
min
"
,
"
hour
"
,
"
mo
u
th
"
],
let
arr
=
[
"
second
"
,
"
min
"
,
"
hour
"
,
"
mo
n
th
"
],
refName
=
"
cron
"
+
name
,
refName
=
"
cron
"
+
name
,
insV
la
ue
;
insV
al
ue
;
if
(
!
this
.
$refs
[
refName
])
return
;
if
(
!
this
.
$refs
[
refName
])
return
;
if
(
arr
.
includes
(
name
))
{
if
(
arr
.
includes
(
name
))
{
if
(
value
===
"
*
"
)
{
if
(
value
===
"
*
"
)
{
insV
la
ue
=
1
;
insV
al
ue
=
1
;
}
else
if
(
value
.
indexOf
(
"
-
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
-
"
)
>
-
1
)
{
let
indexArr
=
value
.
split
(
"
-
"
);
let
indexArr
=
value
.
split
(
"
-
"
);
isNaN
(
indexArr
[
0
])
isNaN
(
indexArr
[
0
])
?
(
this
.
$refs
[
refName
].
cycle01
=
0
)
?
(
this
.
$refs
[
refName
].
cycle01
=
0
)
:
(
this
.
$refs
[
refName
].
cycle01
=
indexArr
[
0
]);
:
(
this
.
$refs
[
refName
].
cycle01
=
indexArr
[
0
]);
this
.
$refs
[
refName
].
cycle02
=
indexArr
[
1
];
this
.
$refs
[
refName
].
cycle02
=
indexArr
[
1
];
insV
la
ue
=
2
;
insV
al
ue
=
2
;
}
else
if
(
value
.
indexOf
(
"
/
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
/
"
)
>
-
1
)
{
let
indexArr
=
value
.
split
(
"
/
"
);
let
indexArr
=
value
.
split
(
"
/
"
);
isNaN
(
indexArr
[
0
])
isNaN
(
indexArr
[
0
])
?
(
this
.
$refs
[
refName
].
average01
=
0
)
?
(
this
.
$refs
[
refName
].
average01
=
0
)
:
(
this
.
$refs
[
refName
].
average01
=
indexArr
[
0
]);
:
(
this
.
$refs
[
refName
].
average01
=
indexArr
[
0
]);
this
.
$refs
[
refName
].
average02
=
indexArr
[
1
];
this
.
$refs
[
refName
].
average02
=
indexArr
[
1
];
insV
la
ue
=
3
;
insV
al
ue
=
3
;
}
else
{
}
else
{
insV
la
ue
=
4
;
insV
al
ue
=
4
;
this
.
$refs
[
refName
].
checkboxList
=
value
.
split
(
"
,
"
);
this
.
$refs
[
refName
].
checkboxList
=
value
.
split
(
"
,
"
);
}
}
}
else
if
(
name
==
"
day
"
)
{
}
else
if
(
name
==
"
day
"
)
{
if
(
value
===
"
*
"
)
{
if
(
value
===
"
*
"
)
{
insV
la
ue
=
1
;
insV
al
ue
=
1
;
}
else
if
(
value
==
"
?
"
)
{
}
else
if
(
value
==
"
?
"
)
{
insV
la
ue
=
2
;
insV
al
ue
=
2
;
}
else
if
(
value
.
indexOf
(
"
-
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
-
"
)
>
-
1
)
{
let
indexArr
=
value
.
split
(
"
-
"
);
let
indexArr
=
value
.
split
(
"
-
"
);
isNaN
(
indexArr
[
0
])
isNaN
(
indexArr
[
0
])
?
(
this
.
$refs
[
refName
].
cycle01
=
0
)
?
(
this
.
$refs
[
refName
].
cycle01
=
0
)
:
(
this
.
$refs
[
refName
].
cycle01
=
indexArr
[
0
]);
:
(
this
.
$refs
[
refName
].
cycle01
=
indexArr
[
0
]);
this
.
$refs
[
refName
].
cycle02
=
indexArr
[
1
];
this
.
$refs
[
refName
].
cycle02
=
indexArr
[
1
];
insV
la
ue
=
3
;
insV
al
ue
=
3
;
}
else
if
(
value
.
indexOf
(
"
/
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
/
"
)
>
-
1
)
{
let
indexArr
=
value
.
split
(
"
/
"
);
let
indexArr
=
value
.
split
(
"
/
"
);
isNaN
(
indexArr
[
0
])
isNaN
(
indexArr
[
0
])
?
(
this
.
$refs
[
refName
].
average01
=
0
)
?
(
this
.
$refs
[
refName
].
average01
=
0
)
:
(
this
.
$refs
[
refName
].
average01
=
indexArr
[
0
]);
:
(
this
.
$refs
[
refName
].
average01
=
indexArr
[
0
]);
this
.
$refs
[
refName
].
average02
=
indexArr
[
1
];
this
.
$refs
[
refName
].
average02
=
indexArr
[
1
];
insV
la
ue
=
4
;
insV
al
ue
=
4
;
}
else
if
(
value
.
indexOf
(
"
W
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
W
"
)
>
-
1
)
{
let
indexArr
=
value
.
split
(
"
W
"
);
let
indexArr
=
value
.
split
(
"
W
"
);
isNaN
(
indexArr
[
0
])
isNaN
(
indexArr
[
0
])
?
(
this
.
$refs
[
refName
].
workday
=
0
)
?
(
this
.
$refs
[
refName
].
workday
=
0
)
:
(
this
.
$refs
[
refName
].
workday
=
indexArr
[
0
]);
:
(
this
.
$refs
[
refName
].
workday
=
indexArr
[
0
]);
insV
la
ue
=
5
;
insV
al
ue
=
5
;
}
else
if
(
value
===
"
L
"
)
{
}
else
if
(
value
===
"
L
"
)
{
insV
la
ue
=
6
;
insV
al
ue
=
6
;
}
else
{
}
else
{
this
.
$refs
[
refName
].
checkboxList
=
value
.
split
(
"
,
"
);
this
.
$refs
[
refName
].
checkboxList
=
value
.
split
(
"
,
"
);
insV
la
ue
=
7
;
insV
al
ue
=
7
;
}
}
}
else
if
(
name
==
"
week
"
)
{
}
else
if
(
name
==
"
week
"
)
{
if
(
value
===
"
*
"
)
{
if
(
value
===
"
*
"
)
{
insV
la
ue
=
1
;
insV
al
ue
=
1
;
}
else
if
(
value
==
"
?
"
)
{
}
else
if
(
value
==
"
?
"
)
{
insV
la
ue
=
2
;
insV
al
ue
=
2
;
}
else
if
(
value
.
indexOf
(
"
-
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
-
"
)
>
-
1
)
{
let
indexArr
=
value
.
split
(
"
-
"
);
let
indexArr
=
value
.
split
(
"
-
"
);
isNaN
(
indexArr
[
0
])
isNaN
(
indexArr
[
0
])
?
(
this
.
$refs
[
refName
].
cycle01
=
0
)
?
(
this
.
$refs
[
refName
].
cycle01
=
0
)
:
(
this
.
$refs
[
refName
].
cycle01
=
indexArr
[
0
]);
:
(
this
.
$refs
[
refName
].
cycle01
=
indexArr
[
0
]);
this
.
$refs
[
refName
].
cycle02
=
indexArr
[
1
];
this
.
$refs
[
refName
].
cycle02
=
indexArr
[
1
];
insV
la
ue
=
3
;
insV
al
ue
=
3
;
}
else
if
(
value
.
indexOf
(
"
#
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
#
"
)
>
-
1
)
{
let
indexArr
=
value
.
split
(
"
#
"
);
let
indexArr
=
value
.
split
(
"
#
"
);
isNaN
(
indexArr
[
0
])
isNaN
(
indexArr
[
0
])
?
(
this
.
$refs
[
refName
].
average01
=
1
)
?
(
this
.
$refs
[
refName
].
average01
=
1
)
:
(
this
.
$refs
[
refName
].
average01
=
indexArr
[
0
]);
:
(
this
.
$refs
[
refName
].
average01
=
indexArr
[
0
]);
this
.
$refs
[
refName
].
average02
=
indexArr
[
1
];
this
.
$refs
[
refName
].
average02
=
indexArr
[
1
];
insV
la
ue
=
4
;
insV
al
ue
=
4
;
}
else
if
(
value
.
indexOf
(
"
L
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
L
"
)
>
-
1
)
{
let
indexArr
=
value
.
split
(
"
L
"
);
let
indexArr
=
value
.
split
(
"
L
"
);
isNaN
(
indexArr
[
0
])
isNaN
(
indexArr
[
0
])
?
(
this
.
$refs
[
refName
].
weekday
=
1
)
?
(
this
.
$refs
[
refName
].
weekday
=
1
)
:
(
this
.
$refs
[
refName
].
weekday
=
indexArr
[
0
]);
:
(
this
.
$refs
[
refName
].
weekday
=
indexArr
[
0
]);
insV
la
ue
=
5
;
insV
al
ue
=
5
;
}
else
{
}
else
{
this
.
$refs
[
refName
].
checkboxList
=
value
.
split
(
"
,
"
);
this
.
$refs
[
refName
].
checkboxList
=
value
.
split
(
"
,
"
);
insV
la
ue
=
7
;
insV
al
ue
=
7
;
}
}
}
else
if
(
name
==
"
year
"
)
{
}
else
if
(
name
==
"
year
"
)
{
if
(
value
==
""
)
{
if
(
value
==
""
)
{
insV
la
ue
=
1
;
insV
al
ue
=
1
;
}
else
if
(
value
==
"
*
"
)
{
}
else
if
(
value
==
"
*
"
)
{
insV
la
ue
=
2
;
insV
al
ue
=
2
;
}
else
if
(
value
.
indexOf
(
"
-
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
-
"
)
>
-
1
)
{
insV
la
ue
=
3
;
insV
al
ue
=
3
;
}
else
if
(
value
.
indexOf
(
"
/
"
)
>
-
1
)
{
}
else
if
(
value
.
indexOf
(
"
/
"
)
>
-
1
)
{
insV
la
ue
=
4
;
insV
al
ue
=
4
;
}
else
{
}
else
{
this
.
$refs
[
refName
].
checkboxList
=
value
.
split
(
"
,
"
);
this
.
$refs
[
refName
].
checkboxList
=
value
.
split
(
"
,
"
);
insV
la
ue
=
5
;
insV
al
ue
=
5
;
}
}
}
}
this
.
$refs
[
refName
].
radioValue
=
insV
la
ue
;
this
.
$refs
[
refName
].
radioValue
=
insV
al
ue
;
},
},
// 表单选项的子组件校验数字格式(通过-props传递)
// 表单选项的子组件校验数字格式(通过-props传递)
checkNumber
(
value
,
minLimit
,
maxLimit
)
{
checkNumber
(
value
,
minLimit
,
maxLimit
)
{
//检查必须为整数
//
检查必须为整数
value
=
Math
.
floor
(
value
);
value
=
Math
.
floor
(
value
);
if
(
value
<
minLimit
)
{
if
(
value
<
minLimit
)
{
value
=
minLimit
;
value
=
minLimit
;
...
@@ -303,29 +303,29 @@ export default {
...
@@ -303,29 +303,29 @@ export default {
},
},
// 填充表达式
// 填充表达式
submitFill
()
{
submitFill
()
{
this
.
$emit
(
"
fill
"
,
this
.
contabValueString
);
this
.
$emit
(
"
fill
"
,
this
.
c
r
ontabValueString
);
this
.
hidePopup
();
this
.
hidePopup
();
},
},
clearCron
()
{
clearCron
()
{
// 还原选择项
// 还原选择项
(
"
准备还原
"
);
(
"
准备还原
"
);
this
.
contabValueObj
=
{
this
.
c
r
ontabValueObj
=
{
second
:
"
*
"
,
second
:
"
*
"
,
min
:
"
*
"
,
min
:
"
*
"
,
hour
:
"
*
"
,
hour
:
"
*
"
,
day
:
"
*
"
,
day
:
"
*
"
,
mo
u
th
:
"
*
"
,
mo
n
th
:
"
*
"
,
week
:
"
?
"
,
week
:
"
?
"
,
year
:
""
,
year
:
""
,
};
};
for
(
let
j
in
this
.
contabValueObj
)
{
for
(
let
j
in
this
.
c
r
ontabValueObj
)
{
this
.
changeRadio
(
j
,
this
.
contabValueObj
[
j
]);
this
.
changeRadio
(
j
,
this
.
c
r
ontabValueObj
[
j
]);
}
}
},
},
},
},
computed
:
{
computed
:
{
contabValueString
:
function
()
{
c
r
ontabValueString
:
function
()
{
let
obj
=
this
.
contabValueObj
;
let
obj
=
this
.
c
r
ontabValueObj
;
let
str
=
let
str
=
obj
.
second
+
obj
.
second
+
"
"
+
"
"
+
...
@@ -335,7 +335,7 @@ export default {
...
@@ -335,7 +335,7 @@ export default {
"
"
+
"
"
+
obj
.
day
+
obj
.
day
+
"
"
+
"
"
+
obj
.
mo
u
th
+
obj
.
mo
n
th
+
"
"
+
"
"
+
obj
.
week
+
obj
.
week
+
(
obj
.
year
==
""
?
""
:
"
"
+
obj
.
year
);
(
obj
.
year
==
""
?
""
:
"
"
+
obj
.
year
);
...
@@ -347,7 +347,7 @@ export default {
...
@@ -347,7 +347,7 @@ export default {
CrontabMin
,
CrontabMin
,
CrontabHour
,
CrontabHour
,
CrontabDay
,
CrontabDay
,
CrontabMo
u
th
,
CrontabMo
n
th
,
CrontabWeek
,
CrontabWeek
,
CrontabYear
,
CrontabYear
,
CrontabResult
,
CrontabResult
,
...
...
ruoyi-ui/src/components/Crontab/mo
u
th.vue
→
ruoyi-ui/src/components/Crontab/mo
n
th.vue
浏览文件 @
cd4119b2
<
template
>
<
template
>
<el-form
size=
'small'
>
<el-form
size=
'small'
>
<el-form-item>
<el-form-item>
<el-radio
v-model=
'radioValue'
:label=
"1"
>
<el-radio
v-model=
'radioValue'
:label=
"1"
>
月,允许的通配符[, - * /]
月,允许的通配符[, - * /]
</el-radio>
</el-radio>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-radio
v-model=
'radioValue'
:label=
"2"
>
<el-radio
v-model=
'radioValue'
:label=
"2"
>
周期从
周期从
<el-input-number
v-model=
'cycle01'
:min=
"1"
:max=
"12"
/>
-
<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=
'cycle02'
:min=
"1"
:max=
"12"
/>
月
</el-radio>
</el-radio>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-radio
v-model=
'radioValue'
:label=
"3"
>
<el-radio
v-model=
'radioValue'
:label=
"3"
>
从
从
<el-input-number
v-model=
'average01'
:min=
"1"
:max=
"12"
/>
月开始,每
<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=
'average02'
:min=
"1"
:max=
"12"
/>
月月执行一次
</el-radio>
</el-radio>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-radio
v-model=
'radioValue'
:label=
"4"
>
<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%"
>
<el-option
v-for=
"item in 12"
:key=
"item"
:value=
"item"
>
{{
item
}}
</el-option>
<el-option
v-for=
"item in 12"
:key=
"item"
:value=
"item"
>
{{
item
}}
</el-option>
</el-select>
</el-select>
</el-radio>
</el-radio>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
radioValue
:
1
,
radioValue
:
1
,
cycle01
:
1
,
cycle01
:
1
,
cycle02
:
2
,
cycle02
:
2
,
average01
:
1
,
average01
:
1
,
average02
:
1
,
average02
:
1
,
checkboxList
:
[],
checkboxList
:
[],
checkNum
:
this
.
check
checkNum
:
this
.
check
}
}
},
},
name
:
'
crontab-mouth
'
,
name
:
'
crontab-month
'
,
props
:
[
'
check
'
,
'
cron
'
],
props
:
[
'
check
'
,
'
cron
'
],
methods
:
{
methods
:
{
// 单选按钮值变化时
// 单选按钮值变化时
radioChange
()
{
radioChange
()
{
if
(
this
.
radioValue
===
1
)
{
if
(
this
.
radioValue
===
1
)
{
this
.
$emit
(
'
update
'
,
'
mouth
'
,
'
*
'
);
this
.
$emit
(
'
update
'
,
'
month
'
,
'
*
'
);
this
.
$emit
(
'
update
'
,
'
year
'
,
'
*
'
);
this
.
$emit
(
'
update
'
,
'
year
'
,
'
*
'
);
}
else
{
}
else
{
if
(
this
.
cron
.
day
===
'
*
'
)
{
if
(
this
.
cron
.
day
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
day
'
,
'
0
'
,
'
mouth
'
);
this
.
$emit
(
'
update
'
,
'
day
'
,
'
0
'
,
'
month
'
);
}
}
if
(
this
.
cron
.
hour
===
'
*
'
)
{
if
(
this
.
cron
.
hour
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
hour
'
,
'
0
'
,
'
mouth
'
);
this
.
$emit
(
'
update
'
,
'
hour
'
,
'
0
'
,
'
month
'
);
}
}
if
(
this
.
cron
.
min
===
'
*
'
)
{
if
(
this
.
cron
.
min
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
min
'
,
'
0
'
,
'
mouth
'
);
this
.
$emit
(
'
update
'
,
'
min
'
,
'
0
'
,
'
month
'
);
}
}
if
(
this
.
cron
.
second
===
'
*
'
)
{
if
(
this
.
cron
.
second
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
second
'
,
'
0
'
,
'
mouth
'
);
this
.
$emit
(
'
update
'
,
'
second
'
,
'
0
'
,
'
month
'
);
}
}
}
}
switch
(
this
.
radioValue
)
{
switch
(
this
.
radioValue
)
{
case
2
:
case
2
:
this
.
$emit
(
'
update
'
,
'
mouth
'
,
this
.
cycle01
+
'
-
'
+
this
.
cycle02
);
this
.
$emit
(
'
update
'
,
'
month
'
,
this
.
cycle01
+
'
-
'
+
this
.
cycle02
);
break
;
break
;
case
3
:
case
3
:
this
.
$emit
(
'
update
'
,
'
mouth
'
,
this
.
average01
+
'
/
'
+
this
.
average02
);
this
.
$emit
(
'
update
'
,
'
month
'
,
this
.
average01
+
'
/
'
+
this
.
average02
);
break
;
break
;
case
4
:
case
4
:
this
.
$emit
(
'
update
'
,
'
mouth
'
,
this
.
checkboxString
);
this
.
$emit
(
'
update
'
,
'
month
'
,
this
.
checkboxString
);
break
;
break
;
}
}
},
},
// 周期两个值变化时
// 周期两个值变化时
cycleChange
()
{
cycleChange
()
{
if
(
this
.
radioValue
==
'
2
'
)
{
if
(
this
.
radioValue
==
'
2
'
)
{
this
.
$emit
(
'
update
'
,
'
mouth
'
,
this
.
cycleTotal
);
this
.
$emit
(
'
update
'
,
'
month
'
,
this
.
cycleTotal
);
}
}
},
},
// 平均两个值变化时
// 平均两个值变化时
averageChange
()
{
averageChange
()
{
if
(
this
.
radioValue
==
'
3
'
)
{
if
(
this
.
radioValue
==
'
3
'
)
{
this
.
$emit
(
'
update
'
,
'
mouth
'
,
this
.
averageTotal
);
this
.
$emit
(
'
update
'
,
'
month
'
,
this
.
averageTotal
);
}
}
},
},
// checkbox值变化时
// checkbox值变化时
checkboxChange
()
{
checkboxChange
()
{
if
(
this
.
radioValue
==
'
4
'
)
{
if
(
this
.
radioValue
==
'
4
'
)
{
this
.
$emit
(
'
update
'
,
'
mouth
'
,
this
.
checkboxString
);
this
.
$emit
(
'
update
'
,
'
month
'
,
this
.
checkboxString
);
}
}
}
}
},
},
watch
:
{
watch
:
{
"
radioValue
"
:
"
radioChange
"
,
"
radioValue
"
:
"
radioChange
"
,
'
cycleTotal
'
:
'
cycleChange
'
,
'
cycleTotal
'
:
'
cycleChange
'
,
'
averageTotal
'
:
'
averageChange
'
,
'
averageTotal
'
:
'
averageChange
'
,
'
checkboxString
'
:
'
checkboxChange
'
'
checkboxString
'
:
'
checkboxChange
'
},
},
computed
:
{
computed
:
{
// 计算两个周期值
// 计算两个周期值
cycleTotal
:
function
()
{
cycleTotal
:
function
()
{
this
.
cycle01
=
this
.
checkNum
(
this
.
cycle01
,
1
,
12
)
this
.
cycle01
=
this
.
checkNum
(
this
.
cycle01
,
1
,
12
)
this
.
cycle02
=
this
.
checkNum
(
this
.
cycle02
,
1
,
12
)
this
.
cycle02
=
this
.
checkNum
(
this
.
cycle02
,
1
,
12
)
return
this
.
cycle01
+
'
-
'
+
this
.
cycle02
;
return
this
.
cycle01
+
'
-
'
+
this
.
cycle02
;
},
},
// 计算平均用到的值
// 计算平均用到的值
averageTotal
:
function
()
{
averageTotal
:
function
()
{
this
.
average01
=
this
.
checkNum
(
this
.
average01
,
1
,
12
)
this
.
average01
=
this
.
checkNum
(
this
.
average01
,
1
,
12
)
this
.
average02
=
this
.
checkNum
(
this
.
average02
,
1
,
12
)
this
.
average02
=
this
.
checkNum
(
this
.
average02
,
1
,
12
)
return
this
.
average01
+
'
/
'
+
this
.
average02
;
return
this
.
average01
+
'
/
'
+
this
.
average02
;
},
},
// 计算勾选的checkbox值合集
// 计算勾选的checkbox值合集
checkboxString
:
function
()
{
checkboxString
:
function
()
{
let
str
=
this
.
checkboxList
.
join
();
let
str
=
this
.
checkboxList
.
join
();
return
str
==
''
?
'
*
'
:
str
;
return
str
==
''
?
'
*
'
:
str
;
}
}
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
ruoyi-ui/src/components/Crontab/result.vue
浏览文件 @
cd4119b2
...
@@ -37,7 +37,7 @@ export default {
...
@@ -37,7 +37,7 @@ export default {
// 获取当前时间精确至[年、月、日、时、分、秒]
// 获取当前时间精确至[年、月、日、时、分、秒]
let
nTime
=
new
Date
();
let
nTime
=
new
Date
();
let
nYear
=
nTime
.
getFullYear
();
let
nYear
=
nTime
.
getFullYear
();
let
nMo
u
th
=
nTime
.
getMonth
()
+
1
;
let
nMo
n
th
=
nTime
.
getMonth
()
+
1
;
let
nDay
=
nTime
.
getDate
();
let
nDay
=
nTime
.
getDate
();
let
nHour
=
nTime
.
getHours
();
let
nHour
=
nTime
.
getHours
();
let
nMin
=
nTime
.
getMinutes
();
let
nMin
=
nTime
.
getMinutes
();
...
@@ -47,7 +47,7 @@ export default {
...
@@ -47,7 +47,7 @@ export default {
this
.
getMinArr
(
ruleArr
[
1
]);
this
.
getMinArr
(
ruleArr
[
1
]);
this
.
getHourArr
(
ruleArr
[
2
]);
this
.
getHourArr
(
ruleArr
[
2
]);
this
.
getDayArr
(
ruleArr
[
3
]);
this
.
getDayArr
(
ruleArr
[
3
]);
this
.
getMo
u
thArr
(
ruleArr
[
4
]);
this
.
getMo
n
thArr
(
ruleArr
[
4
]);
this
.
getWeekArr
(
ruleArr
[
5
]);
this
.
getWeekArr
(
ruleArr
[
5
]);
this
.
getYearArr
(
ruleArr
[
6
],
nYear
);
this
.
getYearArr
(
ruleArr
[
6
],
nYear
);
// 将获取到的数组赋值-方便使用
// 将获取到的数组赋值-方便使用
...
@@ -62,7 +62,7 @@ export default {
...
@@ -62,7 +62,7 @@ export default {
let
mIdx
=
this
.
getIndex
(
mDate
,
nMin
);
let
mIdx
=
this
.
getIndex
(
mDate
,
nMin
);
let
hIdx
=
this
.
getIndex
(
hDate
,
nHour
);
let
hIdx
=
this
.
getIndex
(
hDate
,
nHour
);
let
DIdx
=
this
.
getIndex
(
DDate
,
nDay
);
let
DIdx
=
this
.
getIndex
(
DDate
,
nDay
);
let
MIdx
=
this
.
getIndex
(
MDate
,
nMo
u
th
);
let
MIdx
=
this
.
getIndex
(
MDate
,
nMo
n
th
);
let
YIdx
=
this
.
getIndex
(
YDate
,
nYear
);
let
YIdx
=
this
.
getIndex
(
YDate
,
nYear
);
// 重置月日时分秒的函数(后面用的比较多)
// 重置月日时分秒的函数(后面用的比较多)
const
resetSecond
=
function
()
{
const
resetSecond
=
function
()
{
...
@@ -84,17 +84,17 @@ export default {
...
@@ -84,17 +84,17 @@ export default {
nDay
=
DDate
[
DIdx
]
nDay
=
DDate
[
DIdx
]
resetHour
();
resetHour
();
}
}
const
resetMo
u
th
=
function
()
{
const
resetMo
n
th
=
function
()
{
MIdx
=
0
;
MIdx
=
0
;
nMo
u
th
=
MDate
[
MIdx
]
nMo
n
th
=
MDate
[
MIdx
]
resetDay
();
resetDay
();
}
}
// 如果当前年份不为数组中当前值
// 如果当前年份不为数组中当前值
if
(
nYear
!==
YDate
[
YIdx
])
{
if
(
nYear
!==
YDate
[
YIdx
])
{
resetMo
u
th
();
resetMo
n
th
();
}
}
// 如果当前月份不为数组中当前值
// 如果当前月份不为数组中当前值
if
(
nMo
u
th
!==
MDate
[
MIdx
])
{
if
(
nMo
n
th
!==
MDate
[
MIdx
])
{
resetDay
();
resetDay
();
}
}
// 如果当前“日”不为数组中当前值
// 如果当前“日”不为数组中当前值
...
@@ -114,12 +114,12 @@ export default {
...
@@ -114,12 +114,12 @@ export default {
goYear
:
for
(
let
Yi
=
YIdx
;
Yi
<
YDate
.
length
;
Yi
++
)
{
goYear
:
for
(
let
Yi
=
YIdx
;
Yi
<
YDate
.
length
;
Yi
++
)
{
let
YY
=
YDate
[
Yi
];
let
YY
=
YDate
[
Yi
];
// 如果到达最大值时
// 如果到达最大值时
if
(
nMo
u
th
>
MDate
[
MDate
.
length
-
1
])
{
if
(
nMo
n
th
>
MDate
[
MDate
.
length
-
1
])
{
resetMo
u
th
();
resetMo
n
th
();
continue
;
continue
;
}
}
// 循环月份数组
// 循环月份数组
goMo
u
th
:
for
(
let
Mi
=
MIdx
;
Mi
<
MDate
.
length
;
Mi
++
)
{
goMo
n
th
:
for
(
let
Mi
=
MIdx
;
Mi
<
MDate
.
length
;
Mi
++
)
{
// 赋值、方便后面运算
// 赋值、方便后面运算
let
MM
=
MDate
[
Mi
];
let
MM
=
MDate
[
Mi
];
MM
=
MM
<
10
?
'
0
'
+
MM
:
MM
;
MM
=
MM
<
10
?
'
0
'
+
MM
:
MM
;
...
@@ -127,7 +127,7 @@ export default {
...
@@ -127,7 +127,7 @@ export default {
if
(
nDay
>
DDate
[
DDate
.
length
-
1
])
{
if
(
nDay
>
DDate
[
DDate
.
length
-
1
])
{
resetDay
();
resetDay
();
if
(
Mi
==
MDate
.
length
-
1
)
{
if
(
Mi
==
MDate
.
length
-
1
)
{
resetMo
u
th
();
resetMo
n
th
();
continue
goYear
;
continue
goYear
;
}
}
continue
;
continue
;
...
@@ -144,10 +144,10 @@ export default {
...
@@ -144,10 +144,10 @@ export default {
if
(
Di
==
DDate
.
length
-
1
)
{
if
(
Di
==
DDate
.
length
-
1
)
{
resetDay
();
resetDay
();
if
(
Mi
==
MDate
.
length
-
1
)
{
if
(
Mi
==
MDate
.
length
-
1
)
{
resetMo
u
th
();
resetMo
n
th
();
continue
goYear
;
continue
goYear
;
}
}
continue
goMo
u
th
;
continue
goMo
n
th
;
}
}
continue
;
continue
;
}
}
...
@@ -155,11 +155,11 @@ export default {
...
@@ -155,11 +155,11 @@ export default {
// 判断日期的合法性,不合法的话也是跳出当前循环
// 判断日期的合法性,不合法的话也是跳出当前循环
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
&&
this
.
dayRule
!==
'
workDay
'
&&
this
.
dayRule
!==
'
lastWeek
'
&&
this
.
dayRule
!==
'
lastDay
'
)
{
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
&&
this
.
dayRule
!==
'
workDay
'
&&
this
.
dayRule
!==
'
lastWeek
'
&&
this
.
dayRule
!==
'
lastDay
'
)
{
resetDay
();
resetDay
();
continue
goMo
u
th
;
continue
goMo
n
th
;
}
}
// 如果日期规则中有值时
// 如果日期规则中有值时
if
(
this
.
dayRule
==
'
lastDay
'
)
{
if
(
this
.
dayRule
==
'
lastDay
'
)
{
//如果不是合法日期则需要将前将日期调到合法日期即月末最后一天
//
如果不是合法日期则需要将前将日期调到合法日期即月末最后一天
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
while
(
DD
>
0
&&
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
while
(
DD
>
0
&&
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
...
@@ -169,7 +169,7 @@ export default {
...
@@ -169,7 +169,7 @@ export default {
}
}
}
}
}
else
if
(
this
.
dayRule
==
'
workDay
'
)
{
}
else
if
(
this
.
dayRule
==
'
workDay
'
)
{
//校验并调整如果是2月30号这种日期传进来时需调整至正常月底
//
校验并调整如果是2月30号这种日期传进来时需调整至正常月底
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
while
(
DD
>
0
&&
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
while
(
DD
>
0
&&
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
DD
--
;
DD
--
;
...
@@ -180,15 +180,15 @@ export default {
...
@@ -180,15 +180,15 @@ export default {
let
thisWeek
=
this
.
formatDate
(
new
Date
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
),
'
week
'
);
let
thisWeek
=
this
.
formatDate
(
new
Date
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
),
'
week
'
);
// 当星期日时
// 当星期日时
if
(
thisWeek
==
0
)
{
if
(
thisWeek
==
0
)
{
//先找下一个日,并判断是否为月底
//
先找下一个日,并判断是否为月底
DD
++
;
DD
++
;
thisDD
=
DD
<
10
?
'
0
'
+
DD
:
DD
;
thisDD
=
DD
<
10
?
'
0
'
+
DD
:
DD
;
//判断下一日已经不是合法日期
//
判断下一日已经不是合法日期
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
DD
-=
3
;
DD
-=
3
;
}
}
}
else
if
(
thisWeek
==
6
)
{
}
else
if
(
thisWeek
==
6
)
{
//当星期6时只需判断不是1号就可进行操作
//
当星期6时只需判断不是1号就可进行操作
if
(
this
.
dayRuleSup
!==
1
)
{
if
(
this
.
dayRuleSup
!==
1
)
{
DD
--
;
DD
--
;
}
else
{
}
else
{
...
@@ -196,25 +196,25 @@ export default {
...
@@ -196,25 +196,25 @@ export default {
}
}
}
}
}
else
if
(
this
.
dayRule
==
'
weekDay
'
)
{
}
else
if
(
this
.
dayRule
==
'
weekDay
'
)
{
//如果指定了是星期几
//
如果指定了是星期几
//获取当前日期是属于星期几
//
获取当前日期是属于星期几
let
thisWeek
=
this
.
formatDate
(
new
Date
(
YY
+
'
-
'
+
MM
+
'
-
'
+
DD
+
'
00:00:00
'
),
'
week
'
);
let
thisWeek
=
this
.
formatDate
(
new
Date
(
YY
+
'
-
'
+
MM
+
'
-
'
+
DD
+
'
00:00:00
'
),
'
week
'
);
//校验当前星期是否在星期池(dayRuleSup)中
//
校验当前星期是否在星期池(dayRuleSup)中
if
(
Array
.
indexOf
(
this
.
dayRuleSup
,
thisWeek
)
<
0
)
{
if
(
Array
.
indexOf
(
this
.
dayRuleSup
,
thisWeek
)
<
0
)
{
// 如果到达最大值时
// 如果到达最大值时
if
(
Di
==
DDate
.
length
-
1
)
{
if
(
Di
==
DDate
.
length
-
1
)
{
resetDay
();
resetDay
();
if
(
Mi
==
MDate
.
length
-
1
)
{
if
(
Mi
==
MDate
.
length
-
1
)
{
resetMo
u
th
();
resetMo
n
th
();
continue
goYear
;
continue
goYear
;
}
}
continue
goMo
u
th
;
continue
goMo
n
th
;
}
}
continue
;
continue
;
}
}
}
else
if
(
this
.
dayRule
==
'
assWeek
'
)
{
}
else
if
(
this
.
dayRule
==
'
assWeek
'
)
{
//如果指定了是第几周的星期几
//
如果指定了是第几周的星期几
//获取每月1号是属于星期几
//
获取每月1号是属于星期几
let
thisWeek
=
this
.
formatDate
(
new
Date
(
YY
+
'
-
'
+
MM
+
'
-
'
+
DD
+
'
00:00:00
'
),
'
week
'
);
let
thisWeek
=
this
.
formatDate
(
new
Date
(
YY
+
'
-
'
+
MM
+
'
-
'
+
DD
+
'
00:00:00
'
),
'
week
'
);
if
(
this
.
dayRuleSup
[
1
]
>=
thisWeek
)
{
if
(
this
.
dayRuleSup
[
1
]
>=
thisWeek
)
{
DD
=
(
this
.
dayRuleSup
[
0
]
-
1
)
*
7
+
this
.
dayRuleSup
[
1
]
-
thisWeek
+
1
;
DD
=
(
this
.
dayRuleSup
[
0
]
-
1
)
*
7
+
this
.
dayRuleSup
[
1
]
-
thisWeek
+
1
;
...
@@ -222,17 +222,17 @@ export default {
...
@@ -222,17 +222,17 @@ export default {
DD
=
this
.
dayRuleSup
[
0
]
*
7
+
this
.
dayRuleSup
[
1
]
-
thisWeek
+
1
;
DD
=
this
.
dayRuleSup
[
0
]
*
7
+
this
.
dayRuleSup
[
1
]
-
thisWeek
+
1
;
}
}
}
else
if
(
this
.
dayRule
==
'
lastWeek
'
)
{
}
else
if
(
this
.
dayRule
==
'
lastWeek
'
)
{
//如果指定了每月最后一个星期几
//
如果指定了每月最后一个星期几
//校验并调整如果是2月30号这种日期传进来时需调整至正常月底
//
校验并调整如果是2月30号这种日期传进来时需调整至正常月底
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
if
(
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
while
(
DD
>
0
&&
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
while
(
DD
>
0
&&
this
.
checkDate
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
)
!==
true
)
{
DD
--
;
DD
--
;
thisDD
=
DD
<
10
?
'
0
'
+
DD
:
DD
;
thisDD
=
DD
<
10
?
'
0
'
+
DD
:
DD
;
}
}
}
}
//获取月末最后一天是星期几
//
获取月末最后一天是星期几
let
thisWeek
=
this
.
formatDate
(
new
Date
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
),
'
week
'
);
let
thisWeek
=
this
.
formatDate
(
new
Date
(
YY
+
'
-
'
+
MM
+
'
-
'
+
thisDD
+
'
00:00:00
'
),
'
week
'
);
//找到要求中最近的那个星期几
//
找到要求中最近的那个星期几
if
(
this
.
dayRuleSup
<
thisWeek
)
{
if
(
this
.
dayRuleSup
<
thisWeek
)
{
DD
-=
thisWeek
-
this
.
dayRuleSup
;
DD
-=
thisWeek
-
this
.
dayRuleSup
;
}
else
if
(
this
.
dayRuleSup
>
thisWeek
)
{
}
else
if
(
this
.
dayRuleSup
>
thisWeek
)
{
...
@@ -254,10 +254,10 @@ export default {
...
@@ -254,10 +254,10 @@ export default {
if
(
Di
==
DDate
.
length
-
1
)
{
if
(
Di
==
DDate
.
length
-
1
)
{
resetDay
();
resetDay
();
if
(
Mi
==
MDate
.
length
-
1
)
{
if
(
Mi
==
MDate
.
length
-
1
)
{
resetMo
u
th
();
resetMo
n
th
();
continue
goYear
;
continue
goYear
;
}
}
continue
goMo
u
th
;
continue
goMo
n
th
;
}
}
continue
goDay
;
continue
goDay
;
}
}
...
@@ -277,10 +277,10 @@ export default {
...
@@ -277,10 +277,10 @@ export default {
if
(
Di
==
DDate
.
length
-
1
)
{
if
(
Di
==
DDate
.
length
-
1
)
{
resetDay
();
resetDay
();
if
(
Mi
==
MDate
.
length
-
1
)
{
if
(
Mi
==
MDate
.
length
-
1
)
{
resetMo
u
th
();
resetMo
n
th
();
continue
goYear
;
continue
goYear
;
}
}
continue
goMo
u
th
;
continue
goMo
n
th
;
}
}
continue
goDay
;
continue
goDay
;
}
}
...
@@ -296,9 +296,9 @@ export default {
...
@@ -296,9 +296,9 @@ export default {
resultArr
.
push
(
YY
+
'
-
'
+
MM
+
'
-
'
+
DD
+
'
'
+
hh
+
'
:
'
+
mm
+
'
:
'
+
ss
)
resultArr
.
push
(
YY
+
'
-
'
+
MM
+
'
-
'
+
DD
+
'
'
+
hh
+
'
:
'
+
mm
+
'
:
'
+
ss
)
nums
++
;
nums
++
;
}
}
//如果条数满了就退出循环
//
如果条数满了就退出循环
if
(
nums
==
5
)
break
goYear
;
if
(
nums
==
5
)
break
goYear
;
//如果到达最大值时
//
如果到达最大值时
if
(
si
==
sDate
.
length
-
1
)
{
if
(
si
==
sDate
.
length
-
1
)
{
resetSecond
();
resetSecond
();
if
(
mi
==
mDate
.
length
-
1
)
{
if
(
mi
==
mDate
.
length
-
1
)
{
...
@@ -308,10 +308,10 @@ export default {
...
@@ -308,10 +308,10 @@ export default {
if
(
Di
==
DDate
.
length
-
1
)
{
if
(
Di
==
DDate
.
length
-
1
)
{
resetDay
();
resetDay
();
if
(
Mi
==
MDate
.
length
-
1
)
{
if
(
Mi
==
MDate
.
length
-
1
)
{
resetMo
u
th
();
resetMo
n
th
();
continue
goYear
;
continue
goYear
;
}
}
continue
goMo
u
th
;
continue
goMo
n
th
;
}
}
continue
goDay
;
continue
goDay
;
}
}
...
@@ -323,7 +323,7 @@ export default {
...
@@ -323,7 +323,7 @@ export default {
}
//goMin
}
//goMin
}
//goHour
}
//goHour
}
//goDay
}
//goDay
}
//goMo
u
th
}
//goMo
n
th
}
}
// 判断100年内的结果条数
// 判断100年内的结果条数
if
(
resultArr
.
length
==
0
)
{
if
(
resultArr
.
length
==
0
)
{
...
@@ -339,7 +339,7 @@ export default {
...
@@ -339,7 +339,7 @@ export default {
},
},
//用于计算某位数字在数组中的索引
//
用于计算某位数字在数组中的索引
getIndex
(
arr
,
value
)
{
getIndex
(
arr
,
value
)
{
if
(
value
<=
arr
[
0
]
||
value
>
arr
[
arr
.
length
-
1
])
{
if
(
value
<=
arr
[
0
]
||
value
>
arr
[
arr
.
length
-
1
])
{
return
0
;
return
0
;
...
@@ -365,7 +365,7 @@ export default {
...
@@ -365,7 +365,7 @@ export default {
}
}
},
},
// 获取"月"数组
// 获取"月"数组
getMo
u
thArr
(
rule
)
{
getMo
n
thArr
(
rule
)
{
this
.
dateArr
[
4
]
=
this
.
getOrderArr
(
1
,
12
);
this
.
dateArr
[
4
]
=
this
.
getOrderArr
(
1
,
12
);
if
(
rule
.
indexOf
(
'
-
'
)
>=
0
)
{
if
(
rule
.
indexOf
(
'
-
'
)
>=
0
)
{
this
.
dateArr
[
4
]
=
this
.
getCycleArr
(
rule
,
12
,
false
)
this
.
dateArr
[
4
]
=
this
.
getCycleArr
(
rule
,
12
,
false
)
...
@@ -377,7 +377,7 @@ export default {
...
@@ -377,7 +377,7 @@ export default {
},
},
// 获取"日"数组-主要为日期规则
// 获取"日"数组-主要为日期规则
getWeekArr
(
rule
)
{
getWeekArr
(
rule
)
{
//只有当日期规则的两个值均为“”时则表达日期是有选项的
//
只有当日期规则的两个值均为“”时则表达日期是有选项的
if
(
this
.
dayRule
==
''
&&
this
.
dayRuleSup
==
''
)
{
if
(
this
.
dayRule
==
''
&&
this
.
dayRuleSup
==
''
)
{
if
(
rule
.
indexOf
(
'
-
'
)
>=
0
)
{
if
(
rule
.
indexOf
(
'
-
'
)
>=
0
)
{
this
.
dayRule
=
'
weekDay
'
;
this
.
dayRule
=
'
weekDay
'
;
...
@@ -401,7 +401,7 @@ export default {
...
@@ -401,7 +401,7 @@ export default {
this
.
dayRule
=
'
weekDay
'
;
this
.
dayRule
=
'
weekDay
'
;
this
.
dayRuleSup
=
this
.
getAssignArr
(
rule
)
this
.
dayRuleSup
=
this
.
getAssignArr
(
rule
)
}
}
//如果weekDay时将7调整为0【week值0即是星期日】
//
如果weekDay时将7调整为0【week值0即是星期日】
if
(
this
.
dayRule
==
'
weekDay
'
)
{
if
(
this
.
dayRule
==
'
weekDay
'
)
{
for
(
let
i
=
0
;
i
<
this
.
dayRuleSup
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
dayRuleSup
.
length
;
i
++
)
{
if
(
this
.
dayRuleSup
[
i
]
==
7
)
{
if
(
this
.
dayRuleSup
[
i
]
==
7
)
{
...
@@ -502,7 +502,7 @@ export default {
...
@@ -502,7 +502,7 @@ export default {
},
},
// 根据规则返回一个具有周期性的数组
// 根据规则返回一个具有周期性的数组
getCycleArr
(
rule
,
limit
,
status
)
{
getCycleArr
(
rule
,
limit
,
status
)
{
//status--表示是否从0开始(则从1开始)
//
status--表示是否从0开始(则从1开始)
let
arr
=
[];
let
arr
=
[];
let
cycleArr
=
rule
.
split
(
'
-
'
);
let
cycleArr
=
rule
.
split
(
'
-
'
);
let
min
=
Number
(
cycleArr
[
0
]);
let
min
=
Number
(
cycleArr
[
0
]);
...
@@ -520,7 +520,7 @@ export default {
...
@@ -520,7 +520,7 @@ export default {
arr
.
sort
(
this
.
compare
)
arr
.
sort
(
this
.
compare
)
return
arr
;
return
arr
;
},
},
//比较数字大小(用于Array.sort)
//
比较数字大小(用于Array.sort)
compare
(
value1
,
value2
)
{
compare
(
value1
,
value2
)
{
if
(
value2
-
value1
>
0
)
{
if
(
value2
-
value1
>
0
)
{
return
-
1
;
return
-
1
;
...
@@ -563,4 +563,4 @@ export default {
...
@@ -563,4 +563,4 @@ export default {
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
ruoyi-ui/src/components/Crontab/second.vue
浏览文件 @
cd4119b2
...
@@ -86,7 +86,7 @@ export default {
...
@@ -86,7 +86,7 @@ export default {
}
}
},
},
othChange
()
{
othChange
()
{
//
反解析
//
反解析
let
ins
=
this
.
cron
.
second
let
ins
=
this
.
cron
.
second
(
'
反解析 second
'
,
ins
);
(
'
反解析 second
'
,
ins
);
if
(
ins
===
'
*
'
)
{
if
(
ins
===
'
*
'
)
{
...
@@ -130,4 +130,4 @@ export default {
...
@@ -130,4 +130,4 @@ export default {
}
}
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
ruoyi-ui/src/components/Crontab/week.vue
浏览文件 @
cd4119b2
...
@@ -71,8 +71,8 @@ export default {
...
@@ -71,8 +71,8 @@ export default {
this
.
$emit
(
'
update
'
,
'
week
'
,
'
*
'
);
this
.
$emit
(
'
update
'
,
'
week
'
,
'
*
'
);
this
.
$emit
(
'
update
'
,
'
year
'
,
'
*
'
);
this
.
$emit
(
'
update
'
,
'
year
'
,
'
*
'
);
}
else
{
}
else
{
if
(
this
.
cron
.
mo
u
th
===
'
*
'
)
{
if
(
this
.
cron
.
mo
n
th
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
mo
u
th
'
,
'
0
'
,
'
week
'
);
this
.
$emit
(
'
update
'
,
'
mo
n
th
'
,
'
0
'
,
'
week
'
);
}
}
if
(
this
.
cron
.
day
===
'
*
'
)
{
if
(
this
.
cron
.
day
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
day
'
,
'
0
'
,
'
week
'
);
this
.
$emit
(
'
update
'
,
'
day
'
,
'
0
'
,
'
week
'
);
...
@@ -164,4 +164,4 @@ export default {
...
@@ -164,4 +164,4 @@ export default {
}
}
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
ruoyi-ui/src/components/Crontab/year.vue
浏览文件 @
cd4119b2
...
@@ -55,12 +55,12 @@ export default {
...
@@ -55,12 +55,12 @@ export default {
}
}
},
},
name
:
'
crontab-year
'
,
name
:
'
crontab-year
'
,
props
:
[
'
check
'
,
'
mo
u
th
'
,
'
cron
'
],
props
:
[
'
check
'
,
'
mo
n
th
'
,
'
cron
'
],
methods
:
{
methods
:
{
// 单选按钮值变化时
// 单选按钮值变化时
radioChange
()
{
radioChange
()
{
if
(
this
.
cron
.
mo
u
th
===
'
*
'
)
{
if
(
this
.
cron
.
mo
n
th
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
mo
u
th
'
,
'
0
'
,
'
year
'
);
this
.
$emit
(
'
update
'
,
'
mo
n
th
'
,
'
0
'
,
'
year
'
);
}
}
if
(
this
.
cron
.
day
===
'
*
'
)
{
if
(
this
.
cron
.
day
===
'
*
'
)
{
this
.
$emit
(
'
update
'
,
'
day
'
,
'
0
'
,
'
year
'
);
this
.
$emit
(
'
update
'
,
'
day
'
,
'
0
'
,
'
year
'
);
...
@@ -141,4 +141,4 @@ export default {
...
@@ -141,4 +141,4 @@ export default {
this
.
fullYear
=
Number
(
new
Date
().
getFullYear
());
this
.
fullYear
=
Number
(
new
Date
().
getFullYear
());
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录