From 79b1f01bdc44a7fae0338989a025ccf29aea88e4 Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 13 Dec 2023 17:24:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E3=80=81=E5=88=86=E7=BB=84=E3=80=81=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=89=93=E5=BC=80=E6=96=B0=E9=A1=B5?= =?UTF-8?q?=E7=AD=BE=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=90=8E=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=20=20=20=20-=20[=E5=85=B3=E8=81=94]=20#[1045645115228?= =?UTF-8?q?160]=E7=94=A8=E6=88=B7=E3=80=81=E5=88=86=E7=BB=84=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86-=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E7=AD=BE=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=90=8E=E8=BF=94=E5=9B=9E=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=BC=82=E5=B8=B8=20http://192.168.0.96:8090/demo/rdm?= =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1045645115228?= =?UTF-8?q?160?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/framework/users/role-addview.vue | 15 ++++++++++----- src/views/pages/framework/users/team-addview.vue | 15 ++++++++++----- src/views/pages/framework/users/user-addview.vue | 13 +++++++++---- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/views/pages/framework/users/role-addview.vue b/src/views/pages/framework/users/role-addview.vue index 9828a48c7..990027c54 100644 --- a/src/views/pages/framework/users/role-addview.vue +++ b/src/views/pages/framework/users/role-addview.vue @@ -139,13 +139,13 @@ {{ $t('term.deploy.createsuccess') }}
- +
- +
- +
{{ $t('term.framework.notips') }} @@ -354,9 +354,9 @@ export default { let data = this.convenienceDetail.userProfileOperateList.find(d => d.checked == '1'); let value = data.value; switch (value) { - //返回用户列表 + //返回角色列表 case 'backrolelist': - this.$back(); + this.backRoleManage(); break; //编辑用户 case 'editrole': @@ -662,6 +662,11 @@ export default { } }); } + }, + backRoleManage() { + this.$router.push({ + path: '/role-manage' + }); } }, diff --git a/src/views/pages/framework/users/team-addview.vue b/src/views/pages/framework/users/team-addview.vue index 0438fd902..c3e06d89f 100644 --- a/src/views/pages/framework/users/team-addview.vue +++ b/src/views/pages/framework/users/team-addview.vue @@ -106,13 +106,13 @@ {{ $t('term.deploy.createsuccess') }}
- +
- +
- +
{{ $t('term.framework.notips') }} @@ -411,9 +411,9 @@ export default { let data = this.convenienceDetail.userProfileOperateList.find(d => d.checked == '1'); let value = data.value; switch (value) { - //返回用户列表 + //返回分组 case 'backteamlist': - this.$back(); + this.backTeamManage(); break; //编辑用户 case 'editteam': @@ -510,6 +510,11 @@ export default { } } return dataObj; + }, + backTeamManage() { + this.$router.push({ + path: '/team-manage' + }); } }, filter: {}, diff --git a/src/views/pages/framework/users/user-addview.vue b/src/views/pages/framework/users/user-addview.vue index cb9c3b3ac..a4a7392f4 100644 --- a/src/views/pages/framework/users/user-addview.vue +++ b/src/views/pages/framework/users/user-addview.vue @@ -181,13 +181,13 @@ {{ $t('term.deploy.createsuccess') }}
- +
- +
- +
{{ $t('term.framework.notips') }} @@ -550,7 +550,7 @@ export default { switch (value) { //返回用户列表 case 'backuserlist': - this.$back(); + this.backUserManage(); break; //编辑用户 case 'edituser': @@ -864,6 +864,11 @@ export default { this.$Message.success(this.$t('message.executesuccess')); } }); + }, + backUserManage() { + this.$router.push({ + path: '/user-manage' + }); } }, -- Gitee From 52998d1ec0eba98f9bba1a14479447c590fbaee9 Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 13 Dec 2023 17:32:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/process/task/processdetail/process-autoexec.vue | 2 +- .../pages/process/task/processdetail/process-automatic.vue | 2 +- .../pages/process/task/processdetail/process-changecreate.vue | 2 +- .../pages/process/task/processdetail/process-changehandle.vue | 2 +- src/views/pages/process/task/processdetail/process-cmdbsync.vue | 2 +- src/views/pages/process/task/processdetail/process-event.vue | 2 +- .../pages/process/task/processdetail/process-omnipotent.vue | 2 +- src/views/pages/process/task/processdetail/process-timer.vue | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/pages/process/task/processdetail/process-autoexec.vue b/src/views/pages/process/task/processdetail/process-autoexec.vue index 68d31f9dd..3dc9fb3da 100644 --- a/src/views/pages/process/task/processdetail/process-autoexec.vue +++ b/src/views/pages/process/task/processdetail/process-autoexec.vue @@ -7,7 +7,7 @@ :sessionName="sessionName" >