Inicio Explorar Axuda
Rexistro Iniciar sesión
ztpt-dev
/
scocial-management-platform-frontend
Seguir 2
Destacar 0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

接口调试

李文 %!s(int64=4) %!d(string=hai) anos
pai
10fd419827
achega
a38f4dbf46
Modificáronse 13 ficheiros con 210 adicións e 71 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 2 2
      public/index.html
  2. 2 1
      src/main.js
  3. 9 9
      src/mock/modules/sys-menu.js
  4. 57 17
      src/router/index.js
  5. 10 1
      src/store/index.js
  6. 2 1
      src/store/modules/user.js
  7. 6 0
      src/utils/index.js
  8. 4 4
      src/views/main/main-content-crumb.vue
  9. 25 13
      src/views/main/main-navbar-menu.vue
  10. 8 1
      src/views/main/main-navbar-news.vue
  11. 29 5
      src/views/main/main-navbar-user.vue
  12. 43 4
      src/views/main/main-sidebar.vue
  13. 13 13
      src/views/main/main.vue

+ 2 - 2
public/index.html
Ver ficheiro 

@@ -38,7 +38,7 @@
 
 
   <!-- 开发环境 -->
 
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
 
-    <script>window.SITE_CONFIG['apiURL'] = 'http://172.16.124.27:31902';</script>
 
+    <script>window.SITE_CONFIG['apiURL'] = 'http://124.225.17.80:8060';</script>
 
   <% } %>
 
   <!-- 集成测试环境 -->
 
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
 
@@ -50,7 +50,7 @@
 
   <% } %>
 
   <!-- 生产环境 -->
 
   <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
 
-    <script>window.SITE_CONFIG['apiURL'] = 'http://192.168.12.225:31904';</script>
 
+    <script>window.SITE_CONFIG['apiURL'] = '/api';</script>
 
   <% } %>
 
 </head>
 
 <body>

+ 2 - 1
src/main.js
Ver ficheiro 

@@ -9,7 +9,7 @@ import '@/element-ui/theme/index.css'
 
 import '@/assets/scss/aui.scss'
 
 import http from '@/utils/request'
 
 import postReq from '@/api'
 
-import { hasPermission } from '@/utils'
 
+import { hasPermission, hasPermission2 } from '@/utils'
 
 import cloneDeep from 'lodash/cloneDeep'
 
 import BaiduMap from 'vue-baidu-map'
 
 Vue.config.productionTip = false
 
@@ -33,6 +33,7 @@ if (process.env.NODE_ENV !== 'production') {
 
 Vue.prototype.$http = http
 
 Vue.prototype.$postReq = postReq
 
 Vue.prototype.$hasPermission = hasPermission
 
+Vue.prototype.$hasPermission2 = hasPermission2
 
 
 // 保存整站vuex本地储存初始状态
 
 window.SITE_CONFIG['storeState'] = cloneDeep(store.state)

+ 9 - 9
src/mock/modules/sys-menu.js
Ver ficheiro 

@@ -531,7 +531,7 @@ var navDataList3 = [
 
 ]
 
 var navDataList4 = [
 
   {
 
-    'uuid': '1',
 
+    'UUID': '1',
 
     'parentUUID': 0,
 
     'name': '监测预警',
 
     'ename': 'jcyj',
 
@@ -540,7 +540,7 @@ var navDataList4 = [
 
     'children': []
 
   },
 
   {
 
-    'uuid': '11',
 
+    'UUID': '11',
 
     'parentUUID': '1',
 
     'name': '监测预警',
 
     'ename': 'jcyjindex',
 
@@ -549,7 +549,7 @@ var navDataList4 = [
 
     'children': []
 
   },
 
   {
 
-    'uuid': '111',
 
+    'UUID': '111',
 
     'parentUUID': '11',
 
     'name': 'xiao监测预警',
 
     'ename': 'jcyjindex',
 
@@ -558,7 +558,7 @@ var navDataList4 = [
 
     'children': []
 
   },
 
   {
 
-    'uuid': '1111',
 
+    'UUID': '1111',
 
     'parentUUID': '111',
 
     'name': 'xiaoxiao监测预警',
 
     'ename': 'jcyjindex132',
 
@@ -567,7 +567,7 @@ var navDataList4 = [
 
     'children': []
 
   },
 
   {
 
-    'uuid': '2',
 
+    'UUID': '2',
 
     'parentUUID': 0,
 
     'name': '列表',
 
     'ename': 'lanmu2',
 
@@ -576,7 +576,7 @@ var navDataList4 = [
 
     'children': []
 
   },
 
   {
 
-    'uuid': '21',
 
+    'UUID': '21',
 
     'parentUUID': '2',
 
     'name': '列表2',
 
     'ename': 'lanmu22',
 
@@ -585,7 +585,7 @@ var navDataList4 = [
 
     'children': []
 
   },
 
   {
 
-    'uuid': '3',
 
+    'UUID': '3',
 
     'parentUUID': 0,
 
     'name': '表单',
 
     'ename': 'biaodan1',
 
@@ -594,7 +594,7 @@ var navDataList4 = [
 
     'children': []
 
   },
 
   {
 
-    'uuid': '31',
 
+    'UUID': '31',
 
     'parentUUID': '3',
 
     'name': '表单2',
 
     'ename': 'biaodan2',
 
@@ -603,7 +603,7 @@ var navDataList4 = [
 
     'children': []
 
   },
 
   {
 
-    'uuid': '4',
 
+    'UUID': '4',
 
     'parentUUID': 0,
 
     'name': '网址嵌套',
 
     'ename': 'webaddress',

+ 57 - 17
src/router/index.js
Ver ficheiro 

@@ -33,7 +33,7 @@ export const moduleRoutes = {
 
   redirect: {name: 'login'},
 
   meta: {title: '主入口布局'},
 
   children: [
 
-    // {path: '/home', component: () => import('@/views/modules/home'), name: 'home', meta: {title: '首页', parentUUID: 0, uuid: 'index1'}}
 
+    // {path: '/home', component: () => import('@/views/modules/home'), name: 'home', meta: {title: '首页', parentUUID: 0, UUID: 'index1'}}
 
     // {path: 'home', component: () => import('@/views/business/home/home'), name: 'home', meta: {title: '首页'}}
 
     // {path: 'demo/list-demo', component: () => import('@/views/modules/demo/listDemo/list-demo'), name: 'list-demo', meta: {title: '列表页'}},
 
     // {path: 'demo/all-form-type', component: () => import('@/views/modules/demo/all-form-type'), name: 'all-form-type', meta: {title: '表单页'}}
 
@@ -48,7 +48,7 @@ const router = new Router({
 
 
 router.beforeEach((to, from, next) => {
 
   // 截取路由中token进行处理
 
-  filterToken(to, from, next)
 
+  // filterToken(to, from, next)
 
   // console.log(to)
 
   // console.log(from)
 
   // 添加动态(菜单)路由
 
@@ -68,23 +68,43 @@ router.beforeEach((to, from, next) => {
 
       Vue.prototype.$message.error(res.msg)
 
       return next({name: 'login'})
 
     }
 
-    let homePage = {
 
-      'uuid': 'index1',
 
-      'parentUUID': 0,
 
-      'name': '首页',
 
-      'ename': 'home',
 
-      'path': 'home',
 
-      'componentPath': 'modules/home'
 
-    }
 
-    res.list.unshift(homePage)
 
+    let firstPath = getParent(res.list)
 
+    // console.log(firstPath)
 
+    // if (!firstPath) {
 
+    //   let homePage = {
 
+    //     'UUID': 'index1',
 
+    //     'parentUUID': 0,
 
+    //     'name': '首页',
 
+    //     'ename': 'home',
 
+    //     'path': 'home',
 
+    //     'componentPath': 'modules/home'
 
+    //   }
 
+    //   res.list.unshift(homePage)
 
+    //   firstPath = '/home'
 
+    // }
 
+
 
     window.SITE_CONFIG['menuList'] = res.list
 
     fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList'])
 
-    next({...to, replace: true})
 
+    // console.log(firstPath)
 
+    next({path: firstPath, replace: true})
 
   }).catch(() => {
 
     next({name: 'login'})
 
   })
 
 })
 
 
+function getParent (list) {
 
+  let arr = list.filter((e) => {
 
+    if (!e.path) {
 
+      e.path = e.UUID
 
+    }
 
+    if (!e.url) {
 
+      // e.url = 'https://juejin.im/'
 
+    }
 
+    return !e.parentUUID && e.path && e.url
 
+  })
 
+  return arr[0].path
 
+}
 
+
 
 /**
 
  * 判断当前路由是否为页面路由
 
  * @param {*} route 当前路由
 
@@ -117,7 +137,8 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
 
     }
 
     let path = menuList[i].path
 
     let componentPath = menuList[i].componentPath
 
-    if (!path) {
 
+    let url = menuList[i].url
 
+    if (!url) {
 
       continue
 
     }
 
 
@@ -127,14 +148,15 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
 
       component: '',
 
       name: menuList[i].ename,
 
       meta: {
 
-        uuid: menuList[i].uuid,
 
+        UUID: menuList[i].UUID,
 
         parentUUID: menuList[i].parentUUID,
 
         title: menuList[i].name
 
       }
 
     }
 
-    menuList[i].url = 'https://juejin.im/' // 测试用
 
-    if (isURL(menuList[i].url)) {
 
-      route.meta.iframeURL = menuList[i].url
 
+
 
+    // url = 'https://juejin.im/' // 测试用
 
+    if (isURL(url)) {
 
+      route.meta.iframeURL = url
 
       route.component = () => import(`@/views/modules/home`)
 
     } else {
 
       route.component = () => import(`@/views/${componentPath}`)
 
@@ -167,6 +189,24 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
 
   if (temp.length >= 1) {
 
     return fnAddDynamicMenuRoutes(temp, routes)
 
   }
 
+  // let homePage = {
 
+  //   'UUID': 'index1',
 
+  //   'parentUUID': 0,
 
+  //   'name': '首页',
 
+  //   'ename': 'home',
 
+  //   'path': 'home',
 
+  //   'componentPath': 'modules/home'
 
+  // }
 
+  // routes.push({ // 此时再加入home页面，此页面作为登陆后的第一着陆点
 
+  //   path: 'home',
 
+  //   name: 'home',
 
+  //   componen: () => import(`@/views/modules/home`),
 
+  //   meta: {
 
+  //     UUID: 'index1',
 
+  //     parentUUID: 0,
 
+  //     title: '首页'
 
+  //   }
 
+  // })
 
   // 添加路由
 
   router.addRoutes([
 
     {

+ 10 - 1
src/store/index.js
Ver ficheiro 

@@ -28,7 +28,8 @@ export default new Vuex.Store({
 
         'title': 'home'
 
       }
 
     ],
 
-    contentTabsActiveName: 'home'
 
+    contentTabsActiveName: 'home',
 
+    permission: []
 
   },
 
   modules: {
 
     user
 
@@ -39,6 +40,14 @@ export default new Vuex.Store({
 
       Object.keys(state).forEach((key) => {
 
         state[key] = cloneDeep(window.SITE_CONFIG['storeState'][key])
 
       })
 
+    },
 
+    permission (state, arr) {
 
+      state.permission = arr
 
+    }
 
+  },
 
+  actions: {
 
+    permission ({commit}, arr) {
 
+      commit('permission', arr)
 
     }
 
   }
 
 })

+ 2 - 1
src/store/modules/user.js
Ver ficheiro 

@@ -2,6 +2,7 @@ export default {
 
   state: {
 
     id: 0,
 
     name: '',
 
-    superAdmin: 0
 
+    superAdmin: 0,
 
+    organizations: ''
 
   }
 
 }

+ 6 - 0
src/utils/index.js
Ver ficheiro 

@@ -8,6 +8,12 @@ import store from '@/store'
 
 export function hasPermission (key) {
 
   return window.SITE_CONFIG['permissions'].indexOf(key) !== -1 || false
 
 }
 
+/**
 
+ * 权限2
 
+ */
 
+export function hasPermission2 (key) {
 
+  return store.state.permission.indexOf(key) !== -1 || false
 
+}
 
 
 /**
 
  * 清除登录信息

+ 4 - 4
src/views/main/main-content-crumb.vue
Ver ficheiro 

@@ -16,14 +16,14 @@
 
 export default {
 
   data () {
 
     return {
 
-      uuid: this.$route.meta.uuid,
 
+      UUID: this.$route.meta.UUID,
 
       menuList: window.SITE_CONFIG['menuList'],
 
       menuChain: []
 
     }
 
   },
 
   watch: {
 
     $route () {
 
-      this.uuid = this.$route.meta.uuid
 
+      this.UUID = this.$route.meta.UUID
 
       this.initCrumb()
 
     }
 
   },
 
@@ -33,7 +33,7 @@ export default {
 
   methods: {
 
     initCrumb () {
 
       let item = this.menuList.filter((e) => {
 
-        return e.uuid === this.uuid
 
+        return e.UUID === this.UUID
 
       })
 
       this.menuChain = item
 
       this.setParentItem(item[0].parentUUID)
 
@@ -41,7 +41,7 @@ export default {
 
     },
 
     findParent (parentId) {
 
       let parent = this.menuList.filter((e) => {
 
-        return e.uuid === parentId
 
+        return e.UUID === parentId
 
       })
 
       return parent[0] ? parent[0] : ''
 
     },

+ 25 - 13
src/views/main/main-navbar-menu.vue
Ver ficheiro 

@@ -47,7 +47,7 @@ export default {
 
         //   url: '/home',
 
         //   on: false,
 
         //   icon: 'smp-ni-nav_sy_n',
 
-        //   uuid: 'index1',
 
+        //   UUID: 'index1',
 
         //   parentUUID: 0
 
         // }
 
         // {
 
@@ -122,38 +122,49 @@ export default {
 
       this.isShowMore = (itemW * itemLength > wraperW)
 
     },
 
     initMenu () {
 
-      // uuid
 
+      // UUID
 
       // parentUUID
 
       this.menuDataAll = window.SITE_CONFIG['menuList']
 
       let list = []
 
+      let iconIndex = 0
 
+      let iconArr = Object.values(this.iconArr)
 
       this.menuDataAll.map((e, i) => {
 
-        if (!e.noMenu) {
 
+        if (!e.noMenu || e.url) {
 
           list.push({
 
-            ...e,
 
-            url: e.path ? ('/' + e.path) : '',
 
-            on: false,
 
-            icon: this.iconArr[Object.keys(this.iconArr)[i]]
 
+            ...e
 
+            // url: e.path ? ('/' + e.path) : '',
 
+            // on: false,
 
+            // icon: this.iconArr[Object.keys(this.iconArr)[i]]
 
           })
 
         }
 
       })
 
       list = tool.construct(list, {
 
-        id: 'uuid',
 
+        id: 'UUID',
 
         pid: 'parentUUID',
 
         children: 'children'
 
       })
 
+      list.forEach((e) => {
 
+        e.url = e.path ? ('/' + e.path) : ''
 
+        e.on = false
 
+        e.icon = iconArr[iconIndex++]
 
+        if (iconIndex === iconArr.length) {
 
+          iconIndex = 1
 
+        }
 
+      })
 
       this.menuList = this.menuList.concat(list)
 
     },
 
     getCurrentMenuByUrl () {
 
-      let uuid = this.$route.meta.uuid
 
+      // console.log(this.$route)
 
+      let UUID = this.$route.meta.UUID
 
       let _this = this
 
-      let rootOne = getParent(uuid)
 
+      let rootOne = getParent(UUID)
 
       let menuOne = this.menuList.filter((e) => {
 
-        return e.uuid === rootOne.uuid
 
+        return e.UUID === rootOne.UUID
 
       })[0]
 
       _this.setIndexPage(menuOne)
 
-      function getParent (uuid) {
 
+      function getParent (UUID) {
 
         let item = _this.menuDataAll.filter((e) => {
 
-          return e.uuid === uuid
 
+          return e.UUID === UUID
 
         })[0]
 
         if (!item.parentUUID) {
 
           return item
 
@@ -164,6 +175,7 @@ export default {
 
     },
 
     setIndexPage (item) {
 
       this.setCurrentMenuItem(item)
 
+      this.upMenuItem(item)
 
       item.on = true
 
     },
 
     changeMenuStatus () {

+ 8 - 1
src/views/main/main-navbar-news.vue
Ver ficheiro 

@@ -1,6 +1,8 @@
 
 <template>
 
   <div class="navbar-news">
 
-    <div class="nn-item">
 
+    <!-- 权限写法 -->
 
+    <div class="nn-item" v-if="$hasPermission2('sys_test_add')" >
 
+    <!-- <div class="nn-item"> -->
 
       <i class="smp-nav-icon smp-ni-news">
 
         <span>5</span>
 
       </i>
 
@@ -21,6 +23,11 @@ export default {
 
 
     }
 
   },
 
+  // computed: {
 
+  //   permission () {
 
+  //     return this.$store.state.permission
 
+  //   }
 
+  // },
 
   methods: {
 
 
   }

+ 29 - 5
src/views/main/main-navbar-user.vue
Ver ficheiro 

@@ -1,15 +1,15 @@
 
 <template>
 
-  <div class="navbar-user">
 
+  <div class="navbar-user" @click="showUserFunc">
 
     <div class="nu-main">
 
       <div class="nu-l">
 
         <img v-if="useHeadPictureUrl" :src="useHeadPictureUrl">
 
         <i v-else class="smp-nav-icon-32 smp-ni32-userPic"></i>
 
       </div>
 
       <div class="nu-r">
 
-        <div class="nu-t">省公安厅</div>
 
+        <div class="nu-t">{{department}}</div>
 
         <div class="nu-b">
 
-          <div class="navbar-name">马龙</div>
 
-          <div class="navbar-open-btn" @click="showUserFunc">
 
+          <div class="navbar-name">{{userName}}</div>
 
+          <div class="navbar-open-btn">
 
             <i class="smp-nav-icon-10 smp-ni10-arrow" :class="{'on':isUserFuncOpen}"></i>
 
           </div>
 
         </div>
 
@@ -25,7 +25,7 @@
 
           <i class="smp-nav-icon-16 smp-ni16-pass"></i>
 
           <span>修改密码</span>
 
         </li>
 
-        <li class="nulw-li">
 
+        <li class="nulw-li" @click="logoutHandle">
 
           <i class="smp-nav-icon-16 smp-ni16-out"></i>
 
           <span>退出</span>
 
         </li>
 
@@ -35,6 +35,7 @@
 
 </template>
 
 
 <script>
 
+import { clearLoginInfo } from '@/utils'
 
 export default {
 
   data () {
 
     return {
 
@@ -42,9 +43,32 @@ export default {
 
       isUserFuncOpen: false
 
     }
 
   },
 
+  computed: {
 
+    userName () {
 
+      return this.$store.state.user.name
 
+    },
 
+    department () {
 
+      return this.$store.state.user.organizations
 
+    }
 
+  },
 
   methods: {
 
     showUserFunc () {
 
       this.isUserFuncOpen = !this.isUserFuncOpen
 
+    },
 
+    logoutHandle () {
 
+      this.$confirm(this.$t('prompt.info', { 'handle': this.$t('logout') }), this.$t('prompt.title'), {
 
+        confirmButtonText: this.$t('confirm'),
 
+        cancelButtonText: this.$t('cancel'),
 
+        type: 'warning'
 
+      }).then(() => {
 
+        this.$http.post('/logout').then(({ data: res }) => {
 
+          if (res.code !== 0) {
 
+            return this.$message.error(res.msg)
 
+          }
 
+          clearLoginInfo()
 
+          this.$router.push({ name: 'login' })
 
+        }).catch(() => {})
 
+      }).catch(() => {})
 
     }
 
   }
 
 }

+ 43 - 4
src/views/main/main-sidebar.vue
Ver ficheiro 

@@ -28,7 +28,41 @@ export default {
 
     return {
 
       activeIndex: '',
 
       menuClose: this.$store.state.sidebarFold,
 
+      //       .smp-ni-leftbar_jcyj{
 
+      //   background-image: url('~@/assets/img/sidebar/leftbar_jcyj.png');
 
+      // }
 
+      // .smp-ni-leftbar_xsgzdd{
 
+      //   background-image: url('~@/assets/img/sidebar/leftbar_xsgzdd.png');
 
+      // }
 
+      // .smp-ni-leftbar_xshcl{
 
+      //   background-image: url('~@/assets/img/sidebar/leftbar_xshcl.png');
 
+      // }
 
+      // .smp-ni-leftbar_xshj{
 
+      //   background-image: url('~@/assets/img/sidebar/leftbar_xshj.png');
 
+      // }
 
+      // .smp-ni-leftbar_xskcgj{
 
+      //   background-image: url('~@/assets/img/sidebar/leftbar_xskcgj.png');
 
+      // }
 
+      // .smp-ni-leftbar_xslb{
 
+      //   background-image: url('~@/assets/img/sidebar/leftbar_xslb.png');
 
+      // }
 
+      // .smp-ni-leftbar_xsyp{
 
+      //   background-image: url('~@/assets/img/sidebar/leftbar_xsyp.png');
 
+      // }
 
+      // .smp-ni-leftbar_zhtsfx{
 
+      //   background-image: url('~@/assets/img/sidebar/leftbar_zhtsfx.png');
 
+      // }
 
       iconClass: 'smp-ni-leftbar_jcyj',
 
+      iconArr: {
 
+        leftbar_jcyj: 'smp-ni-leftbar_jcyj',
 
+        leftbar_xsgzdd: 'smp-ni-leftbar_xsgzdd',
 
+        leftbar_xshcl: 'smp-ni-leftbar_xshcl',
 
+        leftbar_xshj: 'smp-ni-leftbar_xshj',
 
+        leftbar_xskcgj: 'smp-ni-leftbar_xskcgj',
 
+        leftbar_xslb: 'smp-ni-leftbar_xslb',
 
+        leftbar_xsyp: 'smp-ni-leftbar_xsyp',
 
+        leftbar_zhtsfx: 'smp-ni-leftbar_zhtsfx'
 
+      },
 
       menuDataAll: [],
 
       currentMenuList: [],
 
       currentMenuName: '暂无',
 
@@ -168,22 +202,27 @@ export default {
 
       }
 
     },
 
     setActiveOne () {
 
-      this.activeIndex = this.$route.meta.uuid
 
+      this.activeIndex = this.$route.meta.UUID
 
     },
 
     addMenu (arr, lv) {
 
       let list = []
 
+      let iconIndex = 0
 
+      let iconArr = Object.values(this.iconArr)
 
       arr.forEach((e) => {
 
         if (!e.noMenu) {
 
           let obj = {
 
             ...e,
 
             lv: lv,
 
-            id: e.uuid,
 
+            id: e.UUID,
 
             url: e.path ? ('/' + e.path) : '',
 
             on: false,
 
-            icon: lv === 1 ? this.iconClass : ''
 
+            icon: lv === 1 ? iconArr[iconIndex++] : ''
 
+          }
 
+          if (iconIndex === iconArr.length) {
 
+            iconIndex = 0
 
           }
 
           if (e.children && e.children.length) {
 
-            obj.children = this.addMenu(e.children, ++lv)
 
+            obj.children = this.addMenu(e.children, (lv + 1))
 
           }
 
           list.push(obj)
 
         }

+ 13 - 13
src/views/main/main.vue
Ver ficheiro 

@@ -55,13 +55,13 @@ export default {
 
   },
 
   created () {
 
     // this.windowResizeHandle()
 
-    this.routeHandle(this.$route)
 
-    // Promise.all([
 
-    //   this.getUserInfo(),
 
-    //   this.getPermissions()
 
-    // ]).then(() => {
 
-    //   this.loading = false
 
-    // })
 
+    // this.routeHandle(this.$route)
 
+    Promise.all([
 
+      this.getUserInfo(),
 
+      this.getPermissions()
 
+    ]).then(() => {
 
+      this.loading = false
 
+    })
 
     this.loading = false
 
     this.navbarFlag = window.SITE_CONFIG['isNavbar']
 
     this.sidebarFlag = window.SITE_CONFIG['isSidebar']
 
@@ -101,22 +101,22 @@ export default {
 
     },
 
     // 获取当前管理员信息
 
     getUserInfo () {
 
-      return this.$http.get('/sys/user/info').then(({ data: res }) => {
 
+      return this.$http.get('/user/info').then(({ data: res }) => {
 
         if (res.code !== 0) {
 
           return this.$message.error(res.msg)
 
         }
 
-        this.$store.state.user.id = res.data.id
 
-        this.$store.state.user.name = res.data.username
 
-        this.$store.state.user.superAdmin = res.data.superAdmin
 
+        this.$store.state.user.name = res.userInfo.displayName
 
+        this.$store.state.user.organizations = res.userInfo.organizations
 
       }).catch(() => {})
 
     },
 
     // 获取权限
 
     getPermissions () {
 
-      return this.$http.get('/sys/menu/permissions').then(({ data: res }) => {
 
+      return this.$http.get('/sys/button/list').then(({ data: res }) => {
 
         if (res.code !== 0) {
 
           return this.$message.error(res.msg)
 
         }
 
-        window.SITE_CONFIG['permissions'] = res.data
 
+        this.$store.dispatch('permission', res.list)
 
+        window.SITE_CONFIG['permissions'] = res.list
 
       }).catch(() => {})
 
     }
 
   }