Prechádzať zdrojové kódy

fix: mock other page

Sendya 6 rokov pred
rodič
commit
c5fb2bb150

+ 1 - 0
src/mock/index.js

@@ -8,6 +8,7 @@ if (process.env.NODE_ENV !== 'production' || process.env.VUE_APP_PREVIEW === 'tr
   require('./services/auth')
   require('./services/user')
   require('./services/manage')
+  require('./services/other')
 
   Mock.setup({
     timeout: 800 // setter delay time

+ 1 - 5
src/mock/services/manage.js

@@ -17,6 +17,7 @@ const serverList = (options) => {
     const tmpKey = key + i
     result.push({
       key: tmpKey,
+      id: tmpKey,
       no: 'No ' + tmpKey,
       description: '这是一段描述',
       callNo: Mock.mock('@integer(1, 999)'),
@@ -35,10 +36,6 @@ const serverList = (options) => {
   })
 }
 
-const role = () => {
-  return builder({ message: 'ok' })
-}
-
 const projects = () => {
   return builder({
     'data': [{
@@ -249,7 +246,6 @@ const radar = () => {
 }
 
 Mock.mock(/\/service/, 'get', serverList)
-Mock.mock(/\/role/, 'get', role)
 Mock.mock(/\/list\/search\/projects/, 'get', projects)
 Mock.mock(/\/workplace\/activity/, 'get', activity)
 Mock.mock(/\/workplace\/teams/, 'get', teams)

+ 974 - 0
src/mock/services/other.js

@@ -0,0 +1,974 @@
+import Mock from 'mockjs2'
+import { builder } from '../util'
+
+const orgTree = () => {
+  return builder([{
+    'key': 'key-01',
+    'title': '研发中心',
+    'icon': 'mail',
+    'children': [{
+      'key': 'key-01-01',
+      'title': '后端组',
+      'icon': null,
+      'group': true,
+      children: [{
+        'key': 'key-01-01-01',
+        'title': 'JAVA',
+        'icon': null
+      },
+      {
+        'key': 'key-01-01-02',
+        'title': 'PHP',
+        'icon': null
+      },
+      {
+        'key': 'key-01-01-03',
+        'title': 'Golang',
+        'icon': null
+      }
+      ]
+    }, {
+      'key': 'key-01-02',
+      'title': '前端组',
+      'icon': null,
+      'group': true,
+      children: [{
+        'key': 'key-01-02-01',
+        'title': 'React',
+        'icon': null
+      },
+      {
+        'key': 'key-01-02-02',
+        'title': 'Vue',
+        'icon': null
+      },
+      {
+        'key': 'key-01-02-03',
+        'title': 'Angular',
+        'icon': null
+      }
+      ]
+    }]
+  }, {
+    'key': 'key-02',
+    'title': '财务部',
+    'icon': 'dollar',
+    'children': [{
+      'key': 'key-02-01',
+      'title': '会计核算',
+      'icon': null
+    }, {
+      'key': 'key-02-02',
+      'title': '成本控制',
+      'icon': null
+    }, {
+      'key': 'key-02-03',
+      'title': '内部控制',
+      'icon': null,
+      'children': [{
+        'key': 'key-02-03-01',
+        'title': '财务制度建设',
+        'icon': null
+      },
+      {
+        'key': 'key-02-03-02',
+        'title': '会计核算',
+        'icon': null
+      }
+      ]
+    }]
+  }])
+}
+
+const role = () => {
+  return builder({
+    'data': [{
+      'id': 'admin',
+      'name': '管理员',
+      'describe': '拥有所有权限',
+      'status': 1,
+      'creatorId': 'system',
+      'createTime': 1497160610259,
+      'deleted': 0,
+      'permissions': [{
+        'roleId': 'admin',
+        'permissionId': 'comment',
+        'permissionName': '评论管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        },
+        {
+          'action': 'delete',
+          'describe': '删除',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'member',
+        'permissionName': '会员管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        },
+        {
+          'action': 'delete',
+          'describe': '删除',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'menu',
+        'permissionName': '菜单管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"import","defaultCheck":false,"describe":"导入"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'import',
+          'describe': '导入',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'order',
+        'permissionName': '订单管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        },
+        {
+          'action': 'delete',
+          'describe': '删除',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'permission',
+        'permissionName': '权限管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        },
+        {
+          'action': 'delete',
+          'describe': '删除',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'role',
+        'permissionName': '角色管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        },
+        {
+          'action': 'delete',
+          'describe': '删除',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'test',
+        'permissionName': '测试权限',
+        'actions': '[]',
+        'actionEntitySet': [],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'user',
+        'permissionName': '用户管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"import","defaultCheck":false,"describe":"导入"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"},{"action":"export","defaultCheck":false,"describe":"导出"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'import',
+          'describe': '导入',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        },
+        {
+          'action': 'delete',
+          'describe': '删除',
+          'defaultCheck': false
+        },
+        {
+          'action': 'export',
+          'describe': '导出',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      }
+      ]
+    },
+    {
+      'id': 'svip',
+      'name': 'SVIP',
+      'describe': '超级会员',
+      'status': 1,
+      'creatorId': 'system',
+      'createTime': 1532417744846,
+      'deleted': 0,
+      'permissions': [{
+        'roleId': 'admin',
+        'permissionId': 'comment',
+        'permissionName': '评论管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        },
+        {
+          'action': 'delete',
+          'describe': '删除',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'member',
+        'permissionName': '会员管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'menu',
+        'permissionName': '菜单管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"import","defaultCheck":false,"describe":"导入"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'import',
+          'describe': '导入',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'order',
+        'permissionName': '订单管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'permission',
+        'permissionName': '权限管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'role',
+        'permissionName': '角色管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        },
+        {
+          'action': 'delete',
+          'describe': '删除',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'test',
+        'permissionName': '测试权限',
+        'actions': '[]',
+        'actionEntitySet': [],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'admin',
+        'permissionId': 'user',
+        'permissionName': '用户管理',
+        'actions': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"import","defaultCheck":false,"describe":"导入"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"},{"action":"export","defaultCheck":false,"describe":"导出"}]',
+        'actionEntitySet': [{
+          'action': 'add',
+          'describe': '新增',
+          'defaultCheck': false
+        },
+        {
+          'action': 'import',
+          'describe': '导入',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        },
+        {
+          'action': 'update',
+          'describe': '修改',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      }
+      ]
+    },
+    {
+      'id': 'user',
+      'name': '普通会员',
+      'describe': '普通用户,只能查询',
+      'status': 1,
+      'creatorId': 'system',
+      'createTime': 1497160610259,
+      'deleted': 0,
+      'permissions': [{
+        'roleId': 'user',
+        'permissionId': 'comment',
+        'permissionName': '评论管理',
+        'actions': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"}]',
+        'actionEntitySet': [{
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+
+      {
+        'roleId': 'user',
+        'permissionId': 'marketing',
+        'permissionName': '营销管理',
+        'actions': '[]',
+        'actionEntitySet': [],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'user',
+        'permissionId': 'member',
+        'permissionName': '会员管理',
+        'actions': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"}]',
+        'actionEntitySet': [{
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'user',
+        'permissionId': 'menu',
+        'permissionName': '菜单管理',
+        'actions': '[]',
+        'actionEntitySet': [],
+        'actionList': null,
+        'dataAccess': null
+      },
+
+      {
+        'roleId': 'user',
+        'permissionId': 'order',
+        'permissionName': '订单管理',
+        'actions': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"}]',
+        'actionEntitySet': [{
+          'action': 'query',
+          'describe': '查询',
+          'defaultCheck': false
+        },
+        {
+          'action': 'get',
+          'describe': '详情',
+          'defaultCheck': false
+        }
+        ],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'user',
+        'permissionId': 'permission',
+        'permissionName': '权限管理',
+        'actions': '[]',
+        'actionEntitySet': [],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'user',
+        'permissionId': 'role',
+        'permissionName': '角色管理',
+        'actions': '[]',
+        'actionEntitySet': [],
+        'actionList': null,
+        'dataAccess': null
+      },
+
+      {
+        'roleId': 'user',
+        'permissionId': 'test',
+        'permissionName': '测试权限',
+        'actions': '[]',
+        'actionEntitySet': [],
+        'actionList': null,
+        'dataAccess': null
+      },
+      {
+        'roleId': 'user',
+        'permissionId': 'user',
+        'permissionName': '用户管理',
+        'actions': '[]',
+        'actionEntitySet': [],
+        'actionList': null,
+        'dataAccess': null
+      }
+      ]
+    }
+    ],
+    'pageSize': 10,
+    'pageNo': 0,
+    'totalPage': 1,
+    'totalCount': 5
+  })
+}
+
+const permissionNoPager = () => {
+  return builder([{
+    'id': 'marketing',
+    'name': '营销管理',
+    'describe': null,
+    'status': 1,
+    'actionData': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+    'sptDaTypes': null,
+    'optionalFields': null,
+    'parents': null,
+    'type': null,
+    'deleted': 0,
+    'actions': [
+      'add',
+      'query',
+      'get',
+      'update',
+      'delete'
+    ]
+  },
+  {
+    'id': 'member',
+    'name': '会员管理',
+    'describe': null,
+    'status': 1,
+    'actionData': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+    'sptDaTypes': null,
+    'optionalFields': '[]',
+    'parents': null,
+    'type': 'default',
+    'deleted': 0,
+    'actions': [
+      'add',
+      'query',
+      'get',
+      'update',
+      'delete'
+    ]
+  },
+  {
+    'id': 'menu',
+    'name': '菜单管理',
+    'describe': null,
+    'status': 1,
+    'actionData': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"import","defaultCheck":false,"describe":"导入"},{"action":"get","defaultCheck":false,"describe":"查询"},{"action":"update","defaultCheck":false,"describe":"修改"}]',
+    'sptDaTypes': null,
+    'optionalFields': '[]',
+    'parents': null,
+    'type': 'default',
+    'deleted': 0,
+    'actions': [
+      'add',
+      'import',
+      'get',
+      'update'
+    ]
+  },
+  {
+    'id': 'order',
+    'name': '订单管理',
+    'describe': null,
+    'status': 1,
+    'actionData': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+    'sptDaTypes': null,
+    'optionalFields': '[]',
+    'parents': null,
+    'type': 'default',
+    'deleted': 0,
+    'actions': [
+      'add',
+      'query',
+      'get',
+      'update',
+      'delete'
+    ]
+  },
+  {
+    'id': 'permission',
+    'name': '权限管理',
+    'describe': null,
+    'status': 1,
+    'actionData': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"查询"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+    'sptDaTypes': null,
+    'optionalFields': '[]',
+    'parents': null,
+    'type': 'default',
+    'deleted': 0,
+    'actions': [
+      'add',
+      'get',
+      'update',
+      'delete'
+    ]
+  },
+  {
+    'id': 'role',
+    'name': '角色管理',
+    'describe': null,
+    'status': 1,
+    'actionData': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"查询"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+    'sptDaTypes': null,
+    'optionalFields': '[]',
+    'parents': null,
+    'type': 'default',
+    'deleted': 0,
+    'actions': [
+      'add',
+      'get',
+      'update',
+      'delete'
+    ]
+  },
+  {
+    'id': 'test',
+    'name': '测试权限',
+    'describe': null,
+    'status': 1,
+    'actionData': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"详情"}]',
+    'sptDaTypes': null,
+    'optionalFields': '[]',
+    'parents': null,
+    'type': 'default',
+    'deleted': 0,
+    'actions': [
+      'add',
+      'get'
+    ]
+  },
+  {
+    'id': 'user',
+    'name': '用户管理',
+    'describe': null,
+    'status': 1,
+    'actionData': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"},{"action":"import","defaultCheck":false,"describe":"导入"},{"action":"export","defaultCheck":false,"describe":"导出"}]',
+    'sptDaTypes': null,
+    'optionalFields': '[]',
+    'parents': null,
+    'type': 'default',
+    'deleted': 0,
+    'actions': [
+      'add',
+      'get'
+    ]
+  }
+  ])
+}
+
+const permissions = () => {
+  return builder({
+    'data': [{
+      'id': 'marketing',
+      'name': '营销管理',
+      'describe': null,
+      'status': 1,
+      'actionData': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+      'sptDaTypes': null,
+      'optionalFields': null,
+      'parents': null,
+      'type': null,
+      'deleted': 0,
+      'actions': [
+        'add',
+        'query',
+        'get',
+        'update',
+        'delete'
+      ]
+    },
+    {
+      'id': 'member',
+      'name': '会员管理',
+      'describe': null,
+      'status': 1,
+      'actionData': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+      'sptDaTypes': null,
+      'optionalFields': '[]',
+      'parents': null,
+      'type': 'default',
+      'deleted': 0,
+      'actions': [
+        'add',
+        'query',
+        'get',
+        'update',
+        'delete'
+      ]
+    },
+    {
+      'id': 'menu',
+      'name': '菜单管理',
+      'describe': null,
+      'status': 1,
+      'actionData': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"import","defaultCheck":false,"describe":"导入"},{"action":"get","defaultCheck":false,"describe":"查询"},{"action":"update","defaultCheck":false,"describe":"修改"}]',
+      'sptDaTypes': null,
+      'optionalFields': '[]',
+      'parents': null,
+      'type': 'default',
+      'deleted': 0,
+      'actions': [
+        'add',
+        'import',
+        'get',
+        'update'
+      ]
+    },
+    {
+      'id': 'order',
+      'name': '订单管理',
+      'describe': null,
+      'status': 1,
+      'actionData': '[{"action":"query","defaultCheck":false,"describe":"查询"},{"action":"get","defaultCheck":false,"describe":"详情"},{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+      'sptDaTypes': null,
+      'optionalFields': '[]',
+      'parents': null,
+      'type': 'default',
+      'deleted': 0,
+      'actions': [
+        'add',
+        'query',
+        'get',
+        'update',
+        'delete'
+      ]
+    },
+    {
+      'id': 'permission',
+      'name': '权限管理',
+      'describe': null,
+      'status': 1,
+      'actionData': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"查询"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+      'sptDaTypes': null,
+      'optionalFields': '[]',
+      'parents': null,
+      'type': 'default',
+      'deleted': 0,
+      'actions': [
+        'add',
+        'get',
+        'update',
+        'delete'
+      ]
+    },
+    {
+      'id': 'role',
+      'name': '角色管理',
+      'describe': null,
+      'status': 1,
+      'actionData': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"查询"},{"action":"update","defaultCheck":false,"describe":"修改"},{"action":"delete","defaultCheck":false,"describe":"删除"}]',
+      'sptDaTypes': null,
+      'optionalFields': '[]',
+      'parents': null,
+      'type': 'default',
+      'deleted': 0,
+      'actions': [
+        'add',
+        'get',
+        'update',
+        'delete'
+      ]
+    },
+    {
+      'id': 'test',
+      'name': '测试权限',
+      'describe': null,
+      'status': 1,
+      'actionData': '[{"action":"add","defaultCheck":false,"describe":"新增"},{"action":"get","defaultCheck":false,"describe":"详情"}]',
+      'sptDaTypes': null,
+      'optionalFields': '[]',
+      'parents': null,
+      'type': 'default',
+      'deleted': 0,
+      'actions': [
+        'add',
+        'get'
+      ]
+    },
+    {
+      'id': 'user',
+      'name': '用户管理',
+      'describe': null,
+      'status': 1,
+      'actionData': '[{"action":"add","describe":"新增","defaultCheck":false},{"action":"get","describe":"查询","defaultCheck":false}]',
+      'sptDaTypes': null,
+      'optionalFields': '[]',
+      'parents': null,
+      'type': 'default',
+      'deleted': 0,
+      'actions': [
+        'add',
+        'get'
+      ]
+    }
+    ],
+    'pageSize': 10,
+    'pageNo': 0,
+    'totalPage': 1,
+    'totalCount': 5
+  })
+}
+
+Mock.mock(/\/org\/tree/, 'get', orgTree)
+Mock.mock(/\/role/, 'get', role)
+Mock.mock(/\/permission\/no-pager/, 'get', permissionNoPager)
+Mock.mock(/\/permission/, 'get', permissions)

+ 1 - 0
src/views/other/UserList.vue

@@ -206,6 +206,7 @@ export default {
       loadData: parameter => {
         return getRoleList(parameter)
           .then(res => {
+            console.log('getRoleList', res)
             return res.result
           })
       },