diff --git a/yudao-ui-admin/src/assets/styles/ruoyi.scss b/yudao-ui-admin/src/assets/styles/ruoyi.scss index 4c2bde64d..3c9c27d02 100644 --- a/yudao-ui-admin/src/assets/styles/ruoyi.scss +++ b/yudao-ui-admin/src/assets/styles/ruoyi.scss @@ -37,7 +37,7 @@ .mb10 { margin-bottom: 10px; } -.ml10 { +.ml0 { margin-left: 10px; } .mt20 { @@ -49,7 +49,7 @@ .mb20 { margin-bottom: 20px; } -.ml20 { +.m20 { margin-left: 20px; } @@ -64,7 +64,7 @@ margin-top: 6vh !important; } -.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body { +.el-dialog .el-dialog__body { overflow: auto; overflow-x: hidden; max-height: 70vh; @@ -137,7 +137,7 @@ /** 表格更多操作下拉样式 */ .el-table .el-dropdown-link { cursor: pointer; - color: #409EFF; + color: #1890ff; margin-left: 5px; } diff --git a/yudao-ui-admin/src/components/Crontab/day.vue b/yudao-ui-admin/src/components/Crontab/day.vue new file mode 100644 index 000000000..fe3eaf0c4 --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/day.vue @@ -0,0 +1,161 @@ + + + diff --git a/yudao-ui-admin/src/components/Crontab/hour.vue b/yudao-ui-admin/src/components/Crontab/hour.vue new file mode 100644 index 000000000..4b1f1fcdb --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/hour.vue @@ -0,0 +1,114 @@ + + + diff --git a/yudao-ui-admin/src/components/Crontab/index.vue b/yudao-ui-admin/src/components/Crontab/index.vue new file mode 100644 index 000000000..3963df28e --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/index.vue @@ -0,0 +1,430 @@ + + + + diff --git a/yudao-ui-admin/src/components/Crontab/min.vue b/yudao-ui-admin/src/components/Crontab/min.vue new file mode 100644 index 000000000..43cab900d --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/min.vue @@ -0,0 +1,116 @@ + + + \ No newline at end of file diff --git a/yudao-ui-admin/src/components/Crontab/month.vue b/yudao-ui-admin/src/components/Crontab/month.vue new file mode 100644 index 000000000..fd0ac384f --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/month.vue @@ -0,0 +1,114 @@ + + + diff --git a/yudao-ui-admin/src/components/Crontab/result.vue b/yudao-ui-admin/src/components/Crontab/result.vue new file mode 100644 index 000000000..aea6e0e46 --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/result.vue @@ -0,0 +1,559 @@ + + + diff --git a/yudao-ui-admin/src/components/Crontab/second.vue b/yudao-ui-admin/src/components/Crontab/second.vue new file mode 100644 index 000000000..e7b776171 --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/second.vue @@ -0,0 +1,117 @@ + + + diff --git a/yudao-ui-admin/src/components/Crontab/week.vue b/yudao-ui-admin/src/components/Crontab/week.vue new file mode 100644 index 000000000..1cec700e8 --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/week.vue @@ -0,0 +1,202 @@ + + + diff --git a/yudao-ui-admin/src/components/Crontab/year.vue b/yudao-ui-admin/src/components/Crontab/year.vue new file mode 100644 index 000000000..5487a6c7f --- /dev/null +++ b/yudao-ui-admin/src/components/Crontab/year.vue @@ -0,0 +1,131 @@ + + + diff --git a/yudao-ui-admin/src/views/infra/job/index.vue b/yudao-ui-admin/src/views/infra/job/index.vue index 1b907068f..e4aa923e0 100644 --- a/yudao-ui-admin/src/views/infra/job/index.vue +++ b/yudao-ui-admin/src/views/infra/job/index.vue @@ -90,7 +90,14 @@ - + + + @@ -108,7 +115,11 @@ - + + + + + @@ -132,15 +143,16 @@ 关 闭 -