From 2f69e0b96ccdc09b24fd0e02610eb72909b7ed27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sat, 30 Apr 2022 22:04:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=8D=E7=AB=AF=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Vue2.x/src/api/accountApi.js               |  7 ++++++
 .../src/layouts/default/widgets/Account.vue   |  8 +++---
 Yi.Vue2.x/src/views/userInfo.vue              | 25 ++++++++-----------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Yi.Vue2.x/src/api/accountApi.js b/Yi.Vue2.x/src/api/accountApi.js
index 30744d7a..fdd6f285 100644
--- a/Yi.Vue2.x/src/api/accountApi.js
+++ b/Yi.Vue2.x/src/api/accountApi.js
@@ -41,6 +41,13 @@ export default {
             method: 'put',
             data: { user, newPassword }
         })
+    },
+    getUserAllInfo()
+    {
+        return myaxios({
+            url: `/Account/getUserAllInfo`,
+            method: 'get'
+        })  
     }
 
 }
\ No newline at end of file
diff --git a/Yi.Vue2.x/src/layouts/default/widgets/Account.vue b/Yi.Vue2.x/src/layouts/default/widgets/Account.vue
index a6218329..79d972b9 100644
--- a/Yi.Vue2.x/src/layouts/default/widgets/Account.vue
+++ b/Yi.Vue2.x/src/layouts/default/widgets/Account.vue
@@ -16,7 +16,7 @@
 
     <v-list :tile="false" flat nav>
       <app-bar-item to="/"
-        ><v-list-item-title v-text="'用户名：'+$store.state.user.user.username"
+        ><v-list-item-title v-text="'用户名：'+$store.state.user.user.userName"
       /></app-bar-item>
       <app-bar-item to="/"
         ><v-list-item-title v-text="'称号：'+$store.state.user.user.nick"
@@ -27,7 +27,7 @@
       <template v-for="(p, i) in profile">
         <v-divider v-if="p.divider" :key="`divider-${i}`" class="mb-2 mt-2" />
 
-        <app-bar-item v-else :key="`item-${i}`" to="/">
+        <app-bar-item v-else :key="`item-${i}`" :to="p.router">
           <v-list-item-title v-text="p.title" />
         </app-bar-item>
       </template>
@@ -40,10 +40,10 @@ export default {
   name: "DefaultAccount",
     data: () => ({
       profile: [
-        { title: "用户信息" },
+        { title: "用户信息",router:"/userInfo" },
         { title: "设置" },
         { divider: true },
-        { title: "登出" },
+        { title: "登出",router:"/login" },
       ],
     }),
 };
diff --git a/Yi.Vue2.x/src/views/userInfo.vue b/Yi.Vue2.x/src/views/userInfo.vue
index cd11f4d1..3d271a5c 100644
--- a/Yi.Vue2.x/src/views/userInfo.vue
+++ b/Yi.Vue2.x/src/views/userInfo.vue
@@ -7,7 +7,7 @@
 
           <v-card-text class="text-center">
             <h6 class="text-h6 mb-2 text--secondary">
-              {{ userInfo.username }}
+              {{ userInfo.userName }}
             </h6>
 
             <h4 class="text-h4 mb-3 text--primary">{{ userInfo.nick }}</h4>
@@ -61,7 +61,7 @@
                         <v-text-field
                           color="purple"
                           label="用户名"
-                          v-model="editInfo.username"
+                          v-model="editInfo.userName"
                           disabled
                         />
                       </v-col>
@@ -154,12 +154,12 @@
                               <v-list-item-subtitle>
                                 <v-row>
                                   <v-col
-                                    v-for="item in editInfo.roles"
+                                    v-for="item in roleInfo"
                                     :key="item.id"
                                     cols="6"
                                     sm="3"
                                     md="1"
-                                    >{{ item.role_name }}</v-col
+                                    >{{ item.roleName }}</v-col
                                   >
                                 </v-row>
                               </v-list-item-subtitle>
@@ -178,7 +178,7 @@
                                     cols="6"
                                     sm="3"
                                     md="1"
-                                    >{{ item.menu_name }}</v-col
+                                    >{{ item.menuName }}</v-col
                                   >
                                 </v-row>
                               </v-list-item-subtitle>
@@ -264,7 +264,6 @@
 <script>
 import fileApi from "../api/fileApi";
 import userApi from "../api/userApi";
-import menuApi from "../api/menuApi";
 import accountApi from "../api/accountApi";
 export default {
   name: "UserProfileView",
@@ -274,6 +273,7 @@ export default {
     editInfo: {},
     newPassword: "",
     dis_newPassword: true,
+       roleInfo:[],
     menuInfo: [],
   }),
   created() {
@@ -313,19 +313,14 @@ export default {
     },
     init() {
       this.newPassword = "";
-      userApi.GetUserInRolesByHttpUser().then((resp) => {
-        this.userInfo = resp.data;
+      accountApi.getUserAllInfo().then((resp) => {
+        this.userInfo = resp.data.user;
         this.userInfo.password = "";
         this.editInfo = Object.assign({}, this.userInfo);
+        this.roleInfo=resp.data.roles;
+        this.menuInfo = resp.data.menus;
         this.$store.commit('SET_USER',this.userInfo)
       });
-
-
-
-
-      menuApi.GetTopMenusByHttpUser().then((resp) => {
-        this.menuInfo = resp.data;
-      });
     },
 choiceImg() {
       this.$refs.imgFile.dispatchEvent(new MouseEvent("click"));