diff --git a/src/main.js b/src/main.js index 0f8ceaa..a4fcea1 100644 --- a/src/main.js +++ b/src/main.js @@ -14,7 +14,6 @@ Vue.prototype.$axios = axios; Vue.prototype.$qs = QS; Vue.prototype.$moment = moment; Vue.config.productionTip = false; -Vue.prototype.$moment = moment; Vue.prototype._ = _; import echarts from "echarts"; diff --git a/src/pages/Home.vue b/src/pages/Home.vue index 35fa918..4dd8634 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -280,12 +280,14 @@ }, //账户管理页面回调方法 - callBack(item) { - let that = this; - this.selectedMenu = "设置管理"; - this.selectedSubMenu = "账户管理"; - this.selectedItemName = this.onePermissionList[2].subMenuList[0].id; - this.$router.push({path: '/account/manager',query:item}); + callBack(val) { + this.selectedMenu = val.selectedMenu; + this.selectedSubMenu = val.selectedSubMenu; + if(val.type == 1){ + this.selectedItemName = this.onePermissionList[2].subMenuList[0].id; + this.$router.push({path: '/account/manager',query:val.data}); + } + }, setHeader(data){ let that = this; diff --git a/src/pages/user/RoleManager.vue b/src/pages/user/RoleManager.vue index 6e01101..2d82b83 100644 --- a/src/pages/user/RoleManager.vue +++ b/src/pages/user/RoleManager.vue @@ -367,7 +367,13 @@ goToAccManagerPage: function (item) { // this.$router.push({path: '/account/manager',query:item}); // 回调首页更新菜单栏选择 - this.bus.$emit("callBack",item); + let request = { + selectedMenu: "设置管理", + selectedSubMenu: "账户管理", + data: item, + type: 1 + }; + this.bus.$emit("callBack",request); }, //选中角色 selectRole: function (id) {