liqianyi пре 2 година
родитељ
комит
9bff7c3d4a
3 измењених фајлова са 16 додато и 3 уклоњено
  1. 5 1
      src/views/main-navbar.vue
  2. 1 0
      src/views/main.vue
  3. 10 2
      src/views/modules/sys/user.vue

+ 5 - 1
src/views/main-navbar.vue

@@ -64,6 +64,7 @@
   import { clearLoginInfo } from '@/utils'
   import PreviewComponent from '@/views/modules/common/preview-component'
   import YouliComponent from '@/views/modules/common/youli-component'
+  import Vue from 'vue'
 export default {
     data () {
       return {
@@ -91,7 +92,10 @@ export default {
         set (val) { this.$store.commit('common/updateMainTabs', val) }
       },
       userName: {
-        get () { return this.$store.state.user.name }
+        get () {
+        // return this.$store.state.user.name
+          return Vue.cookie.get('name')
+        }
       }
     },
     methods: {

+ 1 - 0
src/views/main.vue

@@ -90,6 +90,7 @@
             this.userId = data.data.userId
             this.userName = data.data.username
             this.orgId = data.data.orgId
+            this.$cookie.set('name', data.data.name)
 
             // websocket初始化
             // this.$store.dispatch('websocket/WEBSOCKET_INIT', 'ws://112.74.164.79:10088/web_socket/' + data.data.userId + '_' + (Math.ceil(Math.random() * 100000000)).toString())

+ 10 - 2
src/views/modules/sys/user.vue

@@ -50,15 +50,23 @@
           prop="orgName"
           header-align="center"
           align="center"
-          min-width="140"
+          width="140"
           :show-tooltip-when-overflow="true"
           label="所属机构">
         </el-table-column>
+        <el-table-column
+          prop="roleNames"
+          header-align="center"
+          align="center"
+          width="140"
+          :show-tooltip-when-overflow="true"
+          label="角色">
+        </el-table-column>
         <el-table-column
           prop="mobile"
           header-align="center"
           align="center"
-          min-width="120"
+          min-width="100"
           label="手机号">
         </el-table-column>
         <el-table-column