From 89bd4b9fa1bf5c7bdad84b0a3f735c69dcbe03f3 Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 2 Jul 2025 10:13:00 +0800 Subject: [PATCH 01/36] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=99=A8=E7=BB=84=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoexec/detail/actionDetail/runnergroup-setting.vue | 5 +++-- .../autoexec/detail/actionDetail/runnergrouptag-setting.vue | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue index b7330f18..20e821b6 100644 --- a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue +++ b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue @@ -156,6 +156,7 @@ export default { }, save() { if (this.runnerGroup.value) { + delete this.runnerGroup.text; return this.runnerGroup; } else { return {}; @@ -179,8 +180,8 @@ export default { return label; }, async getRunnerGroupLabel() { - if (this.runnerGroup.value == -1) { - return; + if (this.$utils.isEmpty(this.runnerGroup.value) || this.runnerGroup.value == -1) { + return false; } let params = {defaultValue: [this.runnerGroup.value]}; await this.$api.framework.runner.getRunnerGroup(params) diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue index fcd20939..8e985ddd 100644 --- a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue +++ b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue @@ -149,6 +149,7 @@ export default { this.openParamsSetting(); }, save() { + delete this.runnerGroupTag.text; return this.runnerGroupTag; }, valid() { @@ -169,6 +170,9 @@ export default { return label; }, async getRunnerGroupTagLabel() { + if (this.$utils.isEmpty(this.runnerGroupTag.value)) { + return false; + } let params = {defaultValue: [this.runnerGroupTag.value]}; await this.$api.framework.runner.getRunnerGroupTag(params) .then(res => { -- Gitee From 590c7b4395b438fb5789caeb39b1af402cf74f1b Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 2 Jul 2025 10:26:42 +0800 Subject: [PATCH 02/36] =?UTF-8?q?-[=E4=BF=AE=E5=A4=8D]=20=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=99=A8=E7=BB=84=E6=8A=A5=E9=94=99=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/actionDetail/runnergrouptag-setting.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue index 8e985ddd..eee14874 100644 --- a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue +++ b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue @@ -149,8 +149,12 @@ export default { this.openParamsSetting(); }, save() { - delete this.runnerGroupTag.text; - return this.runnerGroupTag; + if (this.runnerGroupTag.value) { + delete this.runnerGroupTag.text; + return this.runnerGroupTag; + } else { + return {}; + } }, valid() { let isValid = true; -- Gitee From 0f3c5f80b2a967cc50479e591e0c33d09ac3dd58 Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 2 Jul 2025 10:43:02 +0800 Subject: [PATCH 03/36] =?UTF-8?q?-[=E4=BF=AE=E5=A4=8D]=20=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=99=A8=E7=BB=84=E6=A0=87=E7=AD=BE=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/actionDetail/runnergrouptag-setting.vue | 8 ++------ src/views/pages/autoexec/detail/runner-detail.vue | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue index eee14874..8e985ddd 100644 --- a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue +++ b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue @@ -149,12 +149,8 @@ export default { this.openParamsSetting(); }, save() { - if (this.runnerGroupTag.value) { - delete this.runnerGroupTag.text; - return this.runnerGroupTag; - } else { - return {}; - } + delete this.runnerGroupTag.text; + return this.runnerGroupTag; }, valid() { let isValid = true; diff --git a/src/views/pages/autoexec/detail/runner-detail.vue b/src/views/pages/autoexec/detail/runner-detail.vue index 3244dfe7..4edcb779 100644 --- a/src/views/pages/autoexec/detail/runner-detail.vue +++ b/src/views/pages/autoexec/detail/runner-detail.vue @@ -110,7 +110,7 @@ :runtimeParamList="runtimeParamList" > -
+
Date: Wed, 2 Jul 2025 11:29:27 +0800 Subject: [PATCH 04/36] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/autoexec/components/param/edit/json.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/autoexec/components/param/edit/json.vue b/src/views/pages/autoexec/components/param/edit/json.vue index e1b8b63b..bb5155ae 100644 --- a/src/views/pages/autoexec/components/param/edit/json.vue +++ b/src/views/pages/autoexec/components/param/edit/json.vue @@ -62,7 +62,7 @@ export default { filter: {}, computed: { getSetting() { - let setting = this.$utils.deepClone(this.config); + let setting = this.$utils.deepClone(this.config || {}); Object.assign(setting, { rows: 1, type: 'textarea' }); -- Gitee From 7800660ef1c3a9d6c5ec76f87a7442871f75157e Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Wed, 2 Jul 2025 15:24:20 +0800 Subject: [PATCH 05/36] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=87=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E6=89=A7=E8=A1=8C=E6=8C=89=E9=92=AE=20#[1452246112370?= =?UTF-8?q?688]=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E5=8A=A8=E6=89=A7=E8=A1=8C=E6=8C=89?= =?UTF-8?q?=E9=92=AE=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?= =?UTF-8?q?l/939050947543040/939050947543042/1452246112370688?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/framework/schedule/schedule.js | 4 ++ src/resources/assets/languages/dialog/en.json | 6 +- src/resources/assets/languages/dialog/zh.json | 8 ++- src/resources/assets/languages/term/en.json | 8 ++- src/resources/assets/languages/term/zh.json | 8 ++- .../pages/autoexec/manage/time-job-list.vue | 49 ++++++++++++- .../deploy/schedule/schedule-job-manage.vue | 69 ++++++++++++++++++- .../pages/framework/schedule/job-manage.vue | 36 +++++++++- 8 files changed, 171 insertions(+), 17 deletions(-) diff --git a/src/resources/api/framework/schedule/schedule.js b/src/resources/api/framework/schedule/schedule.js index 2bad1fb2..3099a05f 100644 --- a/src/resources/api/framework/schedule/schedule.js +++ b/src/resources/api/framework/schedule/schedule.js @@ -36,6 +36,10 @@ const job = { //获取内存的定时作业列表 searchMemoryJob(params) { return axios.post('/api/rest/scheduler/memory/search', params); + }, + //测试定时作业 + test(params) { + return axios.post('/api/rest/job/test', params); } }; export default job; diff --git a/src/resources/assets/languages/dialog/en.json b/src/resources/assets/languages/dialog/en.json index ca0950e2..b2a44a52 100644 --- a/src/resources/assets/languages/dialog/en.json +++ b/src/resources/assets/languages/dialog/en.json @@ -41,7 +41,8 @@ "actionconfirm": "Operation confirmation", "editconfirm": "Edit confirmation", "canceleditconfirm": "Exit editing confirmation", - "lockconfirm": "Lock Confirmation" + "lockconfirm": "Lock Confirmation", + "testconfirm": "TEST confirmation" }, "content": { "pauseconfirm": "Are you sure to pause {target}？", @@ -86,6 +87,7 @@ "closecomfirm": "Are you sure to close this {target}?", "opencomfirm": "Are you sure to open this {target}?", "canceleditconfirm": "Are you sure to exit editing and unlock the current schema diagram?", - "lockconfirm": "Are you sure you want to lock the current {target}?" + "lockconfirm": "Are you sure you want to lock the current {target}?", + "testconfirm": "Are you sure to test the current {target}" } } \ No newline at end of file diff --git a/src/resources/assets/languages/dialog/zh.json b/src/resources/assets/languages/dialog/zh.json index 58b166ef..1627ddd2 100644 --- a/src/resources/assets/languages/dialog/zh.json +++ b/src/resources/assets/languages/dialog/zh.json @@ -41,7 +41,8 @@ "actionconfirm": "操作确认", "editconfirm": "编辑确认", "canceleditconfirm": "退出编辑确认", - "lockconfirm": "锁定确认" + "lockconfirm": "锁定确认", + "testconfirm": "测试确认" }, "content": { "pausecomfirm": "是否确认暂停当前{target}？", @@ -86,6 +87,7 @@ "closecomfirm": "是否确认关闭当前{target}？", "opencomfirm": "是否确认打开当前{target}？", "canceleditconfirm": "是否确认退出编辑并解除锁定当前架构图？", - "lockconfirm": "是否确认锁定当前{target}？" + "lockconfirm": "是否确认锁定当前{target}？", + "testconfirm": "是否确认测试当前{target}" } -} +} \ No newline at end of file diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index cb1cf860..12290b57 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -910,7 +910,9 @@ "isfirenext": "Do you want to activate the next group", "inputnodelimit": "The quantity cannot exceed 1000", "parall": "Concurrent quantity", - "paralldesc": "Execute the execution targets in order of concurrency." + "paralldesc": "Execute the execution targets in order of concurrency.", + "jobrecord": "Automated job recording", + "jobcount": "Number of automated tasks" }, "framework": { "roleauth": "Authorize immediately after creating the role", @@ -2156,7 +2158,9 @@ "blueSet": "Blue Green", "ismodified": "Modified", "presetrunnergroup": "Preset actuator group", - "testrunnerdesc": "If not specified, actuators will be automatically assigned based on IP matching of actuator groups according to network segments" + "testrunnerdesc": "If not specified, actuators will be automatically assigned based on IP matching of actuator groups according to network segments", + "jobcount": "Number of published assignments", + "jobrecord": "Publish homework records" }, "inspect": { "alarmprompt": "Alarm Prompt", diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index 63b7cdb8..a61b61de 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -910,7 +910,9 @@ "isfirenext": "是否激活下一个组", "inputnodelimit": "数量不能大于1000", "parall": "并发数量", - "paralldesc": "将执行目标按并发数量先后执行。" + "paralldesc": "将执行目标按并发数量先后执行。", + "jobrecord": "自动化作业记录", + "jobcount": "自动化作业数" }, "framework": { "roleauth": "创建完角色立即授权", @@ -2153,7 +2155,9 @@ "blueSet": "蓝绿", "ismodified": "已修改", "presetrunnergroup": "预设执行器组", - "testrunnerdesc": "如果不指定则会通过ip根据网段匹配执行器组自动分配执行器" + "testrunnerdesc": "如果不指定则会通过ip根据网段匹配执行器组自动分配执行器", + "jobcount": "发布作业数", + "jobrecord": "发布作业记录" }, "inspect": { "alarmprompt": "告警提示", diff --git a/src/views/pages/autoexec/manage/time-job-list.vue b/src/views/pages/autoexec/manage/time-job-list.vue index 3a4035da..57fce390 100644 --- a/src/views/pages/autoexec/manage/time-job-list.vue +++ b/src/views/pages/autoexec/manage/time-job-list.vue @@ -88,6 +88,18 @@ @on-change="toggleAction(row)" > +
  • {{ $t('page.test') }}
  • + + {{ $t('term.autoexec.jobrecord') }} +
    • +
  • { + vnode.isShow = false; + let params = { jobUuid: row.uuid, jobHandlerClassName: handler}; + this.$api.framework.schedule + .test(params) + .then(res => { + if (res.Status == 'OK') { + this.$Message.success(this.$t('message.executesuccess')); + this.getTableDataList(1); + } + }); + } + }); } }, computed: {}, diff --git a/src/views/pages/deploy/schedule/schedule-job-manage.vue b/src/views/pages/deploy/schedule/schedule-job-manage.vue index 5bd4db7e..191397ac 100644 --- a/src/views/pages/deploy/schedule/schedule-job-manage.vue +++ b/src/views/pages/deploy/schedule/schedule-job-manage.vue @@ -114,6 +114,18 @@ @on-change="updateSchedule(row)" >
    • +
  • {{ $t('page.test') }}
  • {{ $t('page.delete') }}
    • +
  • + + {{ $t('term.deploy.jobrecord') }} +
    • +
  • + + {{ '执行记录' }} +
    • @@ -130,6 +158,7 @@ +
    + 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 @@