diff --git a/src/views/pages/framework/users/role-addview.vue b/src/views/pages/framework/users/role-addview.vue
index 9828a48c74d6a47a9399feb6db6c908fe1c8771c..990027c542b3fc80b2efa33968688b5f706abe5a 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 0438fd902c6ee7850288daa37db26c1323b76cb9..c3e06d89f9dcf59faa373b9187bdfdeb6dd1b142 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 cb9c3b3ac50ee4519ffe32c6148bab3a118e9e5d..a4a7392f47fd77617fd85d5337d3921cc665fbac 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'
+ });
}
},
diff --git a/src/views/pages/process/task/processdetail/process-autoexec.vue b/src/views/pages/process/task/processdetail/process-autoexec.vue
index 68d31f9dd8e6b42585089b517d0bf7c48778bb6e..3dc9fb3da7aede53c60e16969c379edc702c5a1e 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"
>
- {{ $getFromPage(prevPath.name) }}
+ {{ $getFromPage() }}
diff --git a/src/views/pages/process/task/processdetail/process-automatic.vue b/src/views/pages/process/task/processdetail/process-automatic.vue
index a6e843a59599642d5a4d880797199357aa8073c2..9d3e8ea4c36d2096ae4afa102c80db9110b010fc 100644
--- a/src/views/pages/process/task/processdetail/process-automatic.vue
+++ b/src/views/pages/process/task/processdetail/process-automatic.vue
@@ -7,7 +7,7 @@
:sessionName="sessionName"
>
- {{ $getFromPage(prevPath.name) }}
+ {{ $getFromPage() }}
diff --git a/src/views/pages/process/task/processdetail/process-changecreate.vue b/src/views/pages/process/task/processdetail/process-changecreate.vue
index 3f4f8a69898ceaddf521c921f732c3e0dcca74d9..d329f420fb8917eb0f1db946c47407d3c9ce12c0 100644
--- a/src/views/pages/process/task/processdetail/process-changecreate.vue
+++ b/src/views/pages/process/task/processdetail/process-changecreate.vue
@@ -7,7 +7,7 @@
:sessionName="sessionName"
>
- {{ $getFromPage(prevPath.name) }}
+ {{ $getFromPage() }}
diff --git a/src/views/pages/process/task/processdetail/process-changehandle.vue b/src/views/pages/process/task/processdetail/process-changehandle.vue
index 86d08e2ff987a31233a06821eec76de0c490a08b..003acf288cbb3512ad525dfdf298847fdcce08d7 100644
--- a/src/views/pages/process/task/processdetail/process-changehandle.vue
+++ b/src/views/pages/process/task/processdetail/process-changehandle.vue
@@ -7,7 +7,7 @@
:sessionName="sessionName"
>
- {{ $getFromPage(prevPath.name) }}
+ {{ $getFromPage() }}
diff --git a/src/views/pages/process/task/processdetail/process-cmdbsync.vue b/src/views/pages/process/task/processdetail/process-cmdbsync.vue
index 24c4da06611cf1e0d81311f8f481b6ec560fb43f..f6ee0976731718dcbc18fe941d6bbd991cfd8455 100644
--- a/src/views/pages/process/task/processdetail/process-cmdbsync.vue
+++ b/src/views/pages/process/task/processdetail/process-cmdbsync.vue
@@ -7,7 +7,7 @@
:sessionName="sessionName"
>
- {{ $getFromPage(prevPath.name) }}
+ {{ $getFromPage() }}
diff --git a/src/views/pages/process/task/processdetail/process-event.vue b/src/views/pages/process/task/processdetail/process-event.vue
index 5a8170055f8a71fbb349b32bc1031fe153c3f4db..25b8daeefdac88ad3d06281691ea11ce4c768723 100644
--- a/src/views/pages/process/task/processdetail/process-event.vue
+++ b/src/views/pages/process/task/processdetail/process-event.vue
@@ -7,7 +7,7 @@
:sessionName="sessionName"
>
- {{ $getFromPage(prevPath.name) }}
+ {{ $getFromPage() }}
diff --git a/src/views/pages/process/task/processdetail/process-omnipotent.vue b/src/views/pages/process/task/processdetail/process-omnipotent.vue
index 033de4a543f032a9b995ec0d9272efc0e3c893b9..ce43724ef78483861da869a8b27c6704e5a3bb05 100644
--- a/src/views/pages/process/task/processdetail/process-omnipotent.vue
+++ b/src/views/pages/process/task/processdetail/process-omnipotent.vue
@@ -7,7 +7,7 @@
:sessionName="sessionName"
>
- {{ $getFromPage(prevPath.name) }}
+ {{ $getFromPage() }}
diff --git a/src/views/pages/process/task/processdetail/process-timer.vue b/src/views/pages/process/task/processdetail/process-timer.vue
index 5e683d2113e9ff629c9f902c40c3173fc4399195..8e87618f9046d51f66a58fdedabce5145191c573 100644
--- a/src/views/pages/process/task/processdetail/process-timer.vue
+++ b/src/views/pages/process/task/processdetail/process-timer.vue
@@ -22,7 +22,7 @@
:sessionName="sessionName"
>
- {{ $getFromPage(prevPath.name) }}
+ {{ $getFromPage() }}