From d95810955a2e173fb79bbc4833fcf9aca51188fb Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Fri, 5 Jun 2020 17:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                    |  1 -
 src/pages/Home.vue             | 14 ++++++++------
 src/pages/user/RoleManager.vue |  8 +++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

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) {