diff --git a/README.md b/README.md index cf2bc13b..9dfbeaaa 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ ```bash # 克隆项目 -git clone https://gitea.qinmian.online/ruoyi/cloud-ui.git +git clone https://gitee.com/y_project/MuYu-Vue # 进入项目目录 -cd cloud-ui +cd muyu-ui # 安装依赖 npm install diff --git a/package.json b/package.json index 1aa9f709..6a46cc57 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "clipboard": "2.0.8", "core-js": "3.25.3", "echarts": "5.4.0", - "element-ui": "2.15.14", + "element-ui": "2.15.13", "file-saver": "2.0.5", "fuse.js": "6.4.3", "highlight.js": "9.18.5", @@ -67,7 +67,7 @@ "babel-eslint": "10.1.0", "babel-plugin-dynamic-import-node": "2.3.3", "chalk": "4.1.0", - "compression-webpack-plugin": "6.1.2", + "compression-webpack-plugin": "5.0.2", "connect": "3.6.6", "eslint": "7.15.0", "eslint-plugin-vue": "7.2.0", diff --git a/src/api/monitor/job.js b/src/api/monitor/job.js new file mode 100644 index 00000000..cb851170 --- /dev/null +++ b/src/api/monitor/job.js @@ -0,0 +1,71 @@ +import request from '@/utils/request' + +// 查询定时任务调度列表 +export function listJob(query) { + return request({ + url: '/schedule/job/list', + method: 'get', + params: query + }) +} + +// 查询定时任务调度详细 +export function getJob(jobId) { + return request({ + url: '/schedule/job/' + jobId, + method: 'get' + }) +} + +// 新增定时任务调度 +export function addJob(data) { + return request({ + url: '/schedule/job', + method: 'post', + data: data + }) +} + +// 修改定时任务调度 +export function updateJob(data) { + return request({ + url: '/schedule/job', + method: 'put', + data: data + }) +} + +// 删除定时任务调度 +export function delJob(jobId) { + return request({ + url: '/schedule/job/' + jobId, + method: 'delete' + }) +} + +// 任务状态修改 +export function changeJobStatus(jobId, status) { + const data = { + jobId, + status + } + return request({ + url: '/schedule/job/changeStatus', + method: 'put', + data: data + }) +} + + +// 定时任务立即执行一次 +export function runJob(jobId, jobGroup) { + const data = { + jobId, + jobGroup + } + return request({ + url: '/schedule/job/run', + method: 'put', + data: data + }) +} \ No newline at end of file diff --git a/src/api/monitor/jobLog.js b/src/api/monitor/jobLog.js new file mode 100644 index 00000000..eea2666e --- /dev/null +++ b/src/api/monitor/jobLog.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 查询调度日志列表 +export function listJobLog(query) { + return request({ + url: '/schedule/job/log/list', + method: 'get', + params: query + }) +} + +// 删除调度日志 +export function delJobLog(jobLogId) { + return request({ + url: '/schedule/job/log/' + jobLogId, + method: 'delete' + }) +} + +// 清空调度日志 +export function cleanJobLog() { + return request({ + url: '/schedule/job/log/clean', + method: 'delete' + }) +} diff --git a/src/api/system/config.js b/src/api/system/config.js index a404d825..fee4b3e3 100644 --- a/src/api/system/config.js +++ b/src/api/system/config.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询参数列表 export function listConfig(query) { return request({ - url: '/system/config/list', + url: '/system/config/plus/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listConfig(query) { // 查询参数详细 export function getConfig(configId) { return request({ - url: '/system/config/' + configId, + url: '/system/config/plus/' + configId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getConfig(configId) { // 根据参数键名查询参数值 export function getConfigKey(configKey) { return request({ - url: '/system/config/configKey/' + configKey, + url: '/system/config/plus/configKey/' + configKey, method: 'get' }) } @@ -28,7 +28,7 @@ export function getConfigKey(configKey) { // 新增参数配置 export function addConfig(data) { return request({ - url: '/system/config', + url: '/system/config/plus', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function addConfig(data) { // 修改参数配置 export function updateConfig(data) { return request({ - url: '/system/config', + url: '/system/config/plus', method: 'put', data: data }) @@ -46,7 +46,7 @@ export function updateConfig(data) { // 删除参数配置 export function delConfig(configId) { return request({ - url: '/system/config/' + configId, + url: '/system/config/plus/' + configId, method: 'delete' }) } @@ -54,7 +54,7 @@ export function delConfig(configId) { // 刷新参数缓存 export function refreshCache() { return request({ - url: '/system/config/refreshCache', + url: '/system/config/plus/refreshCache', method: 'delete' }) } diff --git a/src/router/index.js b/src/router/index.js index 186e20b7..2afac71d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -133,6 +133,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/monitor/job-log', + component: Layout, + hidden: true, + permissions: ['monitor:job:list'], + children: [ + { + path: 'index/:jobId(\\d+)', + component: () => import('@/views/monitor/job/log'), + name: 'JobLog', + meta: {title: '调度日志', activeMenu: '/monitor/job'} + } + ] + }, { path: '/tool/gen-edit', component: Layout, diff --git a/src/views/index.vue b/src/views/index.vue index 9952d64a..93edae18 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,6 +1,885 @@ @@ -9,9 +888,14 @@ export default { name: "Index", data() { return { + // 版本号 + version: "3.6.3", }; }, methods: { + goTarget(href) { + window.open(href, "_blank"); + }, }, }; diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue new file mode 100644 index 00000000..d20b070f --- /dev/null +++ b/src/views/monitor/job/index.vue @@ -0,0 +1,527 @@ + + + diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue new file mode 100644 index 00000000..e7a07174 --- /dev/null +++ b/src/views/monitor/job/log.vue @@ -0,0 +1,302 @@ + + +