From 188aae2e8a4e40b124e7d6b5351e2a35faee4533 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 20 Aug 2021 17:54:53 +0800 Subject: [PATCH] task list --- .../dto/{QuartzJob.java => QuartzJobDto.java} | 0 .../vue-element-admin-master/.env.development | 4 +- .../src/api/remote-search.js | 6 +- .../vue-element-admin-master/src/api/task.js | 65 +- .../vue-element-admin-master/src/api/user.js | 2 +- .../src/components/HeaderSearch/index.vue | 2 +- .../src/components/Screenfull/index.vue | 2 +- .../src/components/SizeSelect/index.vue | 2 +- .../vue-element-admin-master/src/main.js | 2 +- .../src/router/index.js | 333 +--------- .../src/router/modules/charts.js | 36 -- .../src/router/modules/components.js | 102 --- .../src/router/modules/nested.js | 66 -- .../src/router/modules/table.js | 41 -- .../src/store/modules/permission.js | 1 - .../src/utils/request.js | 2 - .../src/views/charts/keyboard.vue | 23 - .../src/views/charts/line.vue | 23 - .../src/views/charts/mix-chart.vue | 23 - .../src/views/clipboard/index.vue | 49 -- .../views/components-demo/avatar-upload.vue | 61 -- .../src/views/components-demo/back-to-top.vue | 154 ----- .../src/views/components-demo/count-to.vue | 218 ------- .../src/views/components-demo/dnd-list.vue | 39 -- .../src/views/components-demo/drag-dialog.vue | 61 -- .../src/views/components-demo/drag-kanban.vue | 66 -- .../src/views/components-demo/drag-select.vue | 43 -- .../src/views/components-demo/dropzone.vue | 31 - .../src/views/components-demo/json-editor.vue | 36 -- .../src/views/components-demo/markdown.vue | 101 --- .../src/views/components-demo/mixin.vue | 169 ----- .../src/views/components-demo/split-pane.vue | 67 -- .../src/views/components-demo/sticky.vue | 135 ---- .../src/views/components-demo/tinymce.vue | 36 -- .../src/views/documentation/index.vue | 57 -- .../example/components/ArticleDetail.vue | 289 --------- .../example/components/Dropdown/Comment.vue | 41 -- .../example/components/Dropdown/Platform.vue | 46 -- .../example/components/Dropdown/SourceUrl.vue | 38 -- .../example/components/Dropdown/index.js | 3 - .../src/views/example/components/Warning.vue | 13 - .../src/views/example/create.vue | 13 - .../src/views/example/edit.vue | 13 - .../src/views/example/list.vue | 112 ---- .../excel/components/AutoWidthOption.vue | 34 - .../views/excel/components/BookTypeOption.vue | 39 -- .../views/excel/components/FilenameOption.vue | 27 - .../src/views/excel/export-excel.vue | 116 ---- .../src/views/excel/merge-header.vue | 101 --- .../src/views/excel/select-excel.vue | 107 ---- .../src/views/excel/upload-excel.vue | 42 -- .../src/views/guide/index.vue | 36 -- .../src/views/guide/steps.js | 53 -- .../src/views/icons/element-icons.js | 3 - .../src/views/icons/index.vue | 101 --- .../src/views/icons/svg-icons.js | 10 - .../src/views/login/index.vue | 52 +- .../src/views/nested/menu1/index.vue | 7 - .../src/views/nested/menu1/menu1-1/index.vue | 7 - .../src/views/nested/menu1/menu1-2/index.vue | 7 - .../nested/menu1/menu1-2/menu1-2-1/index.vue | 5 - .../nested/menu1/menu1-2/menu1-2-2/index.vue | 5 - .../src/views/nested/menu1/menu1-3/index.vue | 5 - .../src/views/nested/menu2/index.vue | 5 - .../src/views/pdf/content.js | 58 -- .../src/views/pdf/download.vue | 201 ------ .../src/views/pdf/index.vue | 13 - .../permission/components/SwitchRoles.vue | 32 - .../src/views/permission/directive.vue | 111 ---- .../src/views/permission/page.vue | 19 - .../src/views/permission/role.vue | 271 -------- .../src/views/profile/components/Account.vue | 38 -- .../src/views/profile/components/Activity.vue | 185 ------ .../src/views/profile/components/Timeline.vue | 43 -- .../src/views/profile/components/UserCard.vue | 134 ---- .../src/views/profile/index.vue | 68 -- .../src/views/project/index.vue | 5 + .../src/views/qiniu/upload.vue | 41 -- .../src/views/redirect/index.vue | 12 - .../src/views/tab/components/TabPane.vue | 103 --- .../src/views/tab/index.vue | 57 -- .../src/views/table/complex-table.vue | 379 ----------- .../src/views/table/drag-table.vue | 153 ----- .../dynamic-table/components/FixedThead.vue | 62 -- .../dynamic-table/components/UnfixedThead.vue | 50 -- .../src/views/table/dynamic-table/index.vue | 24 - .../src/views/table/inline-edit-table.vue | 149 ----- .../src/views/task/index.vue | 600 +++++++++++++++--- .../src/views/theme/index.vue | 120 ---- .../src/views/zip/index.vue | 77 --- 90 files changed, 641 insertions(+), 5752 deletions(-) rename scheduler/src/main/java/com/ccsens/scheduler/bean/dto/{QuartzJob.java => QuartzJobDto.java} (100%) delete mode 100644 scheduler/vue-element-admin-master/src/router/modules/charts.js delete mode 100644 scheduler/vue-element-admin-master/src/router/modules/components.js delete mode 100644 scheduler/vue-element-admin-master/src/router/modules/nested.js delete mode 100644 scheduler/vue-element-admin-master/src/router/modules/table.js delete mode 100644 scheduler/vue-element-admin-master/src/views/charts/keyboard.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/charts/line.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/charts/mix-chart.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/clipboard/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/avatar-upload.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/back-to-top.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/count-to.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/dnd-list.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/drag-dialog.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/drag-kanban.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/drag-select.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/dropzone.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/json-editor.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/markdown.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/mixin.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/split-pane.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/sticky.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/components-demo/tinymce.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/documentation/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/example/components/ArticleDetail.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/example/components/Dropdown/Comment.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/example/components/Dropdown/Platform.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/example/components/Dropdown/SourceUrl.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/example/components/Dropdown/index.js delete mode 100644 scheduler/vue-element-admin-master/src/views/example/components/Warning.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/example/create.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/example/edit.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/example/list.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/excel/components/AutoWidthOption.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/excel/components/BookTypeOption.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/excel/components/FilenameOption.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/excel/export-excel.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/excel/merge-header.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/excel/select-excel.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/excel/upload-excel.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/guide/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/guide/steps.js delete mode 100644 scheduler/vue-element-admin-master/src/views/icons/element-icons.js delete mode 100644 scheduler/vue-element-admin-master/src/views/icons/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/icons/svg-icons.js delete mode 100644 scheduler/vue-element-admin-master/src/views/nested/menu1/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/nested/menu1/menu1-1/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/nested/menu1/menu1-2/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/nested/menu1/menu1-3/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/nested/menu2/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/pdf/content.js delete mode 100644 scheduler/vue-element-admin-master/src/views/pdf/download.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/pdf/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/permission/components/SwitchRoles.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/permission/directive.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/permission/page.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/permission/role.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/profile/components/Account.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/profile/components/Activity.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/profile/components/Timeline.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/profile/components/UserCard.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/profile/index.vue create mode 100644 scheduler/vue-element-admin-master/src/views/project/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/qiniu/upload.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/redirect/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/tab/components/TabPane.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/tab/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/table/complex-table.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/table/drag-table.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/table/dynamic-table/components/FixedThead.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/table/dynamic-table/components/UnfixedThead.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/table/dynamic-table/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/table/inline-edit-table.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/theme/index.vue delete mode 100644 scheduler/vue-element-admin-master/src/views/zip/index.vue diff --git a/scheduler/src/main/java/com/ccsens/scheduler/bean/dto/QuartzJob.java b/scheduler/src/main/java/com/ccsens/scheduler/bean/dto/QuartzJobDto.java similarity index 100% rename from scheduler/src/main/java/com/ccsens/scheduler/bean/dto/QuartzJob.java rename to scheduler/src/main/java/com/ccsens/scheduler/bean/dto/QuartzJobDto.java diff --git a/scheduler/vue-element-admin-master/.env.development b/scheduler/vue-element-admin-master/.env.development index 73b41f1..292892d 100644 --- a/scheduler/vue-element-admin-master/.env.development +++ b/scheduler/vue-element-admin-master/.env.development @@ -2,5 +2,7 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'https://test.tall.wiki/gateway' +VUE_APP_BASE_API = 'https://test.tall.wiki' VUE_APP_MOCK_API = '/dev-api' +VUE_APP_TALL_API = 'https://test.tall.wiki/gateway/tall/v1.0' +VUE_APP_SCHEDULER_API = 'https://test.tall.wiki/scheduler' \ No newline at end of file diff --git a/scheduler/vue-element-admin-master/src/api/remote-search.js b/scheduler/vue-element-admin-master/src/api/remote-search.js index 02e42b4..5970158 100644 --- a/scheduler/vue-element-admin-master/src/api/remote-search.js +++ b/scheduler/vue-element-admin-master/src/api/remote-search.js @@ -1,8 +1,10 @@ import request from '@/utils/request' +const mock = process.env.VUE_APP_MOCK_API + export function searchUser(name) { return request({ - url: '/vue-element-admin/search/user', + url: `${mock}/vue-element-admin/search/user`, method: 'get', params: { name } }) @@ -10,7 +12,7 @@ export function searchUser(name) { export function transactionList(query) { return request({ - url: '/vue-element-admin/transaction/list', + url: `${mock}/vue-element-admin/transaction/list`, method: 'get', params: query }) diff --git a/scheduler/vue-element-admin-master/src/api/task.js b/scheduler/vue-element-admin-master/src/api/task.js index 7d18da2..992f075 100644 --- a/scheduler/vue-element-admin-master/src/api/task.js +++ b/scheduler/vue-element-admin-master/src/api/task.js @@ -1,9 +1,68 @@ import request from '@/utils/request' +const scheduler = process.env.VUE_APP_SCHEDULER_API + export function fetchList(query) { return request({ - url: '/vue-element-admin/article/list', - method: 'get', - params: query + url: `${scheduler}/job/list`, + method: 'post', + data: { + param: query + } + }) +} +export function fetchPv(query) { + return request({ + url: `${scheduler}/job/get`, + method: 'post', + data: { + param: query + } + }) +} + +export function createJob(query) { + return request({ + url: `${scheduler}/job/add`, + method: 'post', + data: { + param: query + } + }) +} +export function updateJob(query) { + return request({ + url: `${scheduler}/job/modifyTime`, + method: 'post', + data: { + param: query + } + }) +} +export function pauseJob(query) { + return request({ + url: `${scheduler}/job/pause`, + method: 'post', + data: { + param: query + } + }) +} +export function resumeJob(query) { + return request({ + url: `${scheduler}/job/resume`, + method: 'post', + data: { + param: query + } + }) +} +export function removeJob(query) { + return request({ + url: `${scheduler}/job/remove`, + method: 'post', + data: { + param: query + } }) } diff --git a/scheduler/vue-element-admin-master/src/api/user.js b/scheduler/vue-element-admin-master/src/api/user.js index 951e829..d4a5519 100644 --- a/scheduler/vue-element-admin-master/src/api/user.js +++ b/scheduler/vue-element-admin-master/src/api/user.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const tall = `${process.env.VUE_APP_BASE_API}/tall3/v3.0` +const tall = process.env.VUE_APP_TALL_API export function login(formData) { return request({ diff --git a/scheduler/vue-element-admin-master/src/components/HeaderSearch/index.vue b/scheduler/vue-element-admin-master/src/components/HeaderSearch/index.vue index 6026ebb..8702529 100644 --- a/scheduler/vue-element-admin-master/src/components/HeaderSearch/index.vue +++ b/scheduler/vue-element-admin-master/src/components/HeaderSearch/index.vue @@ -1,6 +1,6 @@ diff --git a/scheduler/vue-element-admin-master/src/components/SizeSelect/index.vue b/scheduler/vue-element-admin-master/src/components/SizeSelect/index.vue index e88065b..e3d24c0 100644 --- a/scheduler/vue-element-admin-master/src/components/SizeSelect/index.vue +++ b/scheduler/vue-element-admin-master/src/components/SizeSelect/index.vue @@ -1,7 +1,7 @@