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 ea6ee865b7662a795b36f234e4ea89cc715fc5c5 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 3 Jul 2025 16:22:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=8D=97=E6=B5=B7?= =?UTF-8?q?=E5=86=9C=E5=95=86tagent=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1437561216532480]南海农商tagent管理页面相关需求 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1437561216532480 --- src/resources/api/framework/tagent/tagent.js | 4 ++ .../pages/framework/tagent/tagent-manage.vue | 70 ++++++++++++++++++- 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/src/resources/api/framework/tagent/tagent.js b/src/resources/api/framework/tagent/tagent.js index 1b2ac3d6..df62a8a9 100644 --- a/src/resources/api/framework/tagent/tagent.js +++ b/src/resources/api/framework/tagent/tagent.js @@ -7,6 +7,10 @@ const tagent = { deleteTagents(params) { return axios.post('/api/rest/tagent/delete', params); }, + //批量删除tagent + batchDeleteTagent(params) { + return axios.post('/api/rest/tagent/delete/batch', params); + }, //查看密码 getAccountById(params) { return axios.post('api/rest/tagent/account/get', params); diff --git a/src/views/pages/framework/tagent/tagent-manage.vue b/src/views/pages/framework/tagent/tagent-manage.vue index 7e20a982..8216e597 100644 --- a/src/views/pages/framework/tagent/tagent-manage.vue +++ b/src/views/pages/framework/tagent/tagent-manage.vue @@ -7,6 +7,22 @@ {{ $t('term.framework.batchupgrade') }} {{ $t('term.framework.batchreboot') }} {{ $t('term.framework.batchresetcred') }} + + + {{ $t('page.batchdelete') }} + +
{{ '已连接状态的tagent不能删除' }}
+ {{ $t('term.framework.tagentupgrade') }} {{ $t('term.framework.tagentinstall') }} {{ $t('page.export') }} @@ -24,7 +40,9 @@ { + if (item.status === 'connected') { + this.batchDeleteIsDisabled = true; + } + }); + this.selected = itemList; + }, + batchDelete() { + if (this.selected && this.selected.length > 0) { + let tagentNameList = []; + let tagentIdList = []; + let flag = false; + this.selected.forEach(item => { + if (item.status === 'connected') { + flag = true; + } + tagentNameList.push(item.name); + tagentIdList.push(item.id); + }); + if (flag) { + return; + } + let params = { + idList: tagentIdList + }; + // 批量删除确认提示框 + this.$createDialog({ + title: this.$t('dialog.title.deleteconfirm'), + content: this.$t('dialog.content.deletetargetconfirm', {target: tagentNameList.join(', ')}), + btnType: 'error', + 'on-ok': vnode => { + this.$api.framework.tagent.batchDeleteTagent(params) + .then((res) => { + if (res.Status == 'OK') { + this.changeCurrent(); + this.selected = []; + this.$Message.success(this.$t('message.deletesuccess')); + } + }).finally(res => { + vnode.isShow = false; + }); + } + }); + } } }, computed: {}, -- Gitee From 174e708998cfea10ee84115f570b8df412dba579 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 3 Jul 2025 16:25:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=8D=97=E6=B5=B7?= =?UTF-8?q?=E5=86=9C=E5=95=86tagent=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1437561216532480]南海农商tagent管理页面相关需求 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1437561216532480 --- src/resources/assets/languages/term/en.json | 3 ++- src/resources/assets/languages/term/zh.json | 3 ++- src/views/pages/framework/tagent/tagent-manage.vue | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index 36793503..1f4d07ac 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -1355,7 +1355,8 @@ "tagentuploadupgradepkg": "Upload upgrade package", "versionremarks": "Version Remarks", "heartbeaturl": "Backend server address", - "runnergrouptips": "The request for login authentication needs to carry a header as a rule expression (note that the header parameter in the expression must be all lowercase and the prefix must be {prefix}). If the value of the expression after execution is true, the executor group will take effect, and false and syntax exceptions will not take effect. For example:" + "runnergrouptips": "The request for login authentication needs to carry a header as a rule expression (note that the header parameter in the expression must be all lowercase and the prefix must be {prefix}). If the value of the expression after execution is true, the executor group will take effect, and false and syntax exceptions will not take effect. For example:", + "batchdeletetagenttooltip": "Tagent in connected state cannot be deleted" }, "knowledge": { "document": "Document", diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index 17ed38c6..7e901aa7 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -1355,7 +1355,8 @@ "tagentuploadupgradepkg": "上传升级包", "versionremarks": "版本备注", "heartbeaturl": "后端服务器地址", - "runnergrouptips": "登录认证的请求需要携带Header做规则表达式(注意表达式中header参数全小写，且前缀必须为{prefix})，如果表达式执行后的值为true则该执行器组生效，false和语法异常都不生效。如:" + "runnergrouptips": "登录认证的请求需要携带Header做规则表达式(注意表达式中header参数全小写，且前缀必须为{prefix})，如果表达式执行后的值为true则该执行器组生效，false和语法异常都不生效。如:", + "batchdeletetagenttooltip": "已连接状态的tagent不能删除" }, "knowledge": { "document": "文档", diff --git a/src/views/pages/framework/tagent/tagent-manage.vue b/src/views/pages/framework/tagent/tagent-manage.vue index 8216e597..96a6613a 100644 --- a/src/views/pages/framework/tagent/tagent-manage.vue +++ b/src/views/pages/framework/tagent/tagent-manage.vue @@ -21,7 +21,7 @@ > {{ $t('page.batchdelete') }} -
{{ '已连接状态的tagent不能删除' }}
+
{{ $t('term.framework.batchdeletetagenttooltip') }}
{{ $t('term.framework.tagentupgrade') }} {{ $t('term.framework.tagentinstall') }} -- Gitee