From bea7b9b3000ca6c65740f2761d7c6c351e2f778a Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 11 Jun 2025 19:39:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E5=88=97=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=B7=B2=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1441426846482432]定时作业管理页增加一列显示作业是否已加载 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1441426846482432 --- src/resources/assets/languages/page/en.json | 3 +- src/resources/assets/languages/page/zh.json | 3 +- .../pages/autoexec/manage/time-job-list.vue | 5 +++ .../deploy/schedule/schedule-job-manage.vue | 40 +++++++++++++++++++ .../pages/framework/schedule/job-manage.vue | 8 ++++ .../pages/report/sendjob/sendjob-manage.vue | 5 +++ 6 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json index 76cafa28..170cf71c 100644 --- a/src/resources/assets/languages/page/en.json +++ b/src/resources/assets/languages/page/en.json @@ -1068,5 +1068,6 @@ "cache": "Cache", "connectionsuccessful": "Connection successful", "driverjar": "Driver jar package", - "ignored": "Neglected" + "ignored": "Neglected", + "loaded": "Loaded" } \ No newline at end of file diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json index 917a1def..1d1d6fc3 100644 --- a/src/resources/assets/languages/page/zh.json +++ b/src/resources/assets/languages/page/zh.json @@ -1070,5 +1070,6 @@ "cache": "缓存", "connectionsuccessful": "连接成功", "driverjar": "驱动jar包", - "ignored": "已忽略" + "ignored": "已忽略", + "loaded": "已加载" } \ No newline at end of file diff --git a/src/views/pages/autoexec/manage/time-job-list.vue b/src/views/pages/autoexec/manage/time-job-list.vue index 8629d9c3..bd589d70 100644 --- a/src/views/pages/autoexec/manage/time-job-list.vue +++ b/src/views/pages/autoexec/manage/time-job-list.vue @@ -32,6 +32,10 @@ + + + + @@ -148,6 +152,10 @@ export default { title: this.$t('page.keeprecords'), key: 'needAudit' }, + { + title: this.$t('page.loaded'), + key: 'isLoad' + }, { title: this.$t('page.plantime'), key: 'cron' diff --git a/src/views/pages/report/sendjob/sendjob-manage.vue b/src/views/pages/report/sendjob/sendjob-manage.vue index ed7e5091..8fe56aeb 100644 --- a/src/views/pages/report/sendjob/sendjob-manage.vue +++ b/src/views/pages/report/sendjob/sendjob-manage.vue @@ -36,6 +36,10 @@ + @@ -118,6 +122,7 @@ export default { {title: this.$t('page.name'), key: 'name'}, {title: this.$t('page.emailtitle'), key: 'emailTitle'}, {title: this.$t('page.recipient'), key: 'toNameList'}, + {title: this.$t('page.loaded'), key: 'isLoad'}, {title: this.$t('page.executeplan'), key: 'cron'}, {title: this.$t('page.status'), key: 'isActive'}, {title: this.$t('term.report.nextsendingtime'), key: 'nextFireTime'}, -- Gitee From d5b296b2d81a7bdf68c5c8ff67842b48c26f59a6 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 2 Jul 2025 15:34:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=92=8C=E4=B8=8B=E8=BD=BD=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1444848047980544]查看和下载日志页面 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1444848047980544 --- src/resources/api/framework/index.js | 4 +- src/resources/api/framework/log/log.js | 13 ++ src/resources/api/framework/server/server.js | 4 +- src/resources/assets/languages/page/en.json | 3 +- src/resources/assets/languages/page/zh.json | 3 +- src/resources/assets/languages/router/en.json | 3 +- src/resources/assets/languages/router/zh.json | 3 +- src/views/pages/framework/log/log-manage.vue | 198 ++++++++++++++++++ src/views/pages/framework/router.js | 13 ++ .../pages/framework/server/server-manage.vue | 11 +- 10 files changed, 246 insertions(+), 9 deletions(-) create mode 100644 src/resources/api/framework/log/log.js create mode 100644 src/views/pages/framework/log/log-manage.vue diff --git a/src/resources/api/framework/index.js b/src/resources/api/framework/index.js index 867bb425..9fb60fde 100644 --- a/src/resources/api/framework/index.js +++ b/src/resources/api/framework/index.js @@ -37,6 +37,7 @@ import extramenu from './extramenu/extramenu'; //附加菜单 import region from './region/region';//地域管理 import homepage from './homepage/homepage';//默认首页 import changelogaudit from './changelogaudit/changelogaudit';//数据库变更记录 +import log from './log/log';// 查看日志 export default { role, user, @@ -75,5 +76,6 @@ export default { extramenu, region, homepage, - changelogaudit + changelogaudit, + log }; diff --git a/src/resources/api/framework/log/log.js b/src/resources/api/framework/log/log.js new file mode 100644 index 00000000..37d4b3fc --- /dev/null +++ b/src/resources/api/framework/log/log.js @@ -0,0 +1,13 @@ +import axios from '../../http'; + +const log = { + getLogFileNameList(params) { + return axios.post('/api/rest/log/filename/list', params); + }, + + getLogContent(params) { + return axios.post('/api/rest/log/content/get', params); + } +}; + +export default log; diff --git a/src/resources/api/framework/server/server.js b/src/resources/api/framework/server/server.js index 364e199a..a7e25a88 100644 --- a/src/resources/api/framework/server/server.js +++ b/src/resources/api/framework/server/server.js @@ -1,8 +1,8 @@ import axios from '../../http'; const server = { - getServerList() { - return axios.post('api/rest/server/list', {}); + getServerList(param) { + return axios.post('api/rest/server/list', param); }, saveServer(param) { return axios.post('api/rest/server/save', param); diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json index e86bb39e..685fb7d5 100644 --- a/src/resources/assets/languages/page/en.json +++ b/src/resources/assets/languages/page/en.json @@ -1076,5 +1076,6 @@ "autoexecbatchround": "in batches", "autoexecparall": "Concurrency", "autoexecparallel": "Concurrent settings", - "paramkeyword": "Participate in search" + "paramkeyword": "Participate in search", + "loglevel": "log level" } \ No newline at end of file diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json index fe13d332..f6ac6356 100644 --- a/src/resources/assets/languages/page/zh.json +++ b/src/resources/assets/languages/page/zh.json @@ -1078,5 +1078,6 @@ "autoexecbatchround": "分批", "autoexecparall": "并发", "autoexecparallel": "并发设置", - "paramkeyword": "入参搜索" + "paramkeyword": "入参搜索", + "loglevel": "日志级别" } \ No newline at end of file diff --git a/src/resources/assets/languages/router/en.json b/src/resources/assets/languages/router/en.json index cc1a64b3..22778a4b 100644 --- a/src/resources/assets/languages/router/en.json +++ b/src/resources/assets/languages/router/en.json @@ -170,7 +170,8 @@ "license": "License Management", "extramenu": "Menu management", "homepage": "default page ", - "changelogaudit": "Database Change Log" + "changelogaudit": "Database Change Log", + "log": "view log" }, "knowledge": { "knowledgedetail": "entry details", diff --git a/src/resources/assets/languages/router/zh.json b/src/resources/assets/languages/router/zh.json index 9d4626d5..0e70111e 100644 --- a/src/resources/assets/languages/router/zh.json +++ b/src/resources/assets/languages/router/zh.json @@ -170,7 +170,8 @@ "license": "许可管理", "extramenu": "菜单管理", "homepage": "默认首页", - "changelogaudit": "数据库变更记录" + "changelogaudit": "数据库变更记录", + "log": "查看日志" }, "knowledge": { "knowledgedetail": "词条详情", diff --git a/src/views/pages/framework/log/log-manage.vue b/src/views/pages/framework/log/log-manage.vue new file mode 100644 index 00000000..2e6a389a --- /dev/null +++ b/src/views/pages/framework/log/log-manage.vue @@ -0,0 +1,198 @@ + + + diff --git a/src/views/pages/framework/router.js b/src/views/pages/framework/router.js index d751ed90..6bd822aa 100644 --- a/src/views/pages/framework/router.js +++ b/src/views/pages/framework/router.js @@ -61,6 +61,7 @@ const extramenuManage = () => import('./extramenu/extramenu-manage.vue'); //菜 const regionManage = () => import('./region/region-manage.vue');//地域管理 const homepageManage = () => import('./homepage/homepage-manage.vue');//首页管理 const changelogAuditManage = () => import('./changelogaudit/changelogaudit-manage.vue');//数据库变更记录 +const logManage = () => import('./log/log-manage.vue');//查看日志 import { $t } from '@/resources/init.js'; import { config } from './config.js'; @@ -756,6 +757,18 @@ let routerList = [ authority: 'ADMIN', type: 'others' } + }, + { + path: '/log-manage', + name: 'logManage', + component: logManage, + meta: { + title: $t('router.framework.log'), + ismenu: true, + icon: 'tsfont-history', + authority: 'ADMIN', + type: 'others' + } } ]; export default routerList; diff --git a/src/views/pages/framework/server/server-manage.vue b/src/views/pages/framework/server/server-manage.vue index 2c791648..6bd92535 100644 --- a/src/views/pages/framework/server/server-manage.vue +++ b/src/views/pages/framework/server/server-manage.vue @@ -3,7 +3,12 @@