Z 1 year ago
parent
commit
5f13164347

+ 2 - 2
src/store/modules/user.js

@@ -15,7 +15,7 @@ const formatRouter = (list) => {
     for (const p of list) {
       if (p.menuType === 2) {
         // p.children = [];
-        // authorities.push(p);
+        authorities.push(p);
         p.hide = true;
       }
       //  else {
@@ -67,7 +67,7 @@ export default {
     },
     // 设置登录用户的权限
     setAuthorities(state, authorities) {
-      state.authorities = authorities;
+      state.authorities = authorities.map((item) => item.permissionCode);
     },
     // 设置登录用户的权限路由
     setAuthoritiesRouter(state, authoritiesRouter) {

+ 9 - 9
src/views/system/threeMembers/index.vue

@@ -109,15 +109,15 @@ export default {
           slot: 'description',
           headerSlot: 'tableHeaderTitle',
         },
-        {
-          columnKey: 'action',
-          label: '操作',
-          width: 300,
-          align: 'center',
-          resizable: false,
-          slot: 'action',
-          showOverflowTooltip: true
-        }
+        // {
+        //   columnKey: 'action',
+        //   label: '操作',
+        //   width: 300,
+        //   align: 'center',
+        //   resizable: false,
+        //   slot: 'action',
+        //   showOverflowTooltip: true
+        // }
       ],
     };
   },

+ 1 - 0
src/views/system/user/index.vue

@@ -212,6 +212,7 @@
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
+        console.log(this.$hasPermission('sys:account:add'));
         return pageUsers({ ...where, ...order, pageNum: page, size: limit });
       },
       async changeEnable(row) {

+ 1 - 2
vue.config.js

@@ -33,8 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.124:50001',
         // target: 'http://192.168.1.147:18086',
-        target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.105:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''