去掉测试数据

src/api/userManager.js

@@ -58,7 +58,7 @@ export function saveRole(data) {
 
 export function modifyRole(data) {
   return request({
-    url: '/role/modify',
+    url: '/role/update',
     method: 'put',
     data
   })

src/store/modules/user.js

@@ -37,6 +37,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
+          // data.roles = data.roleInfo && data.roleInfo.foleInfos && data.roleInfo.foleInfos[0] && data.roleInfo.foleInfos[0].roleId === 1 ? ['admin'] : ['channel']
           data.roles = data.rank.indexOf('CHANNEL') !== -1 ? ['channel'] : ['admin']
           if (data.roles && data.roles.length > 0) {
             commit('SET_ROLES', data.roles)

src/views/user/manager.vue

 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="listQuery.username" placeholder="登录账号" clearable style="width: 200px;" class="filter-item" @keyup.enter.native="fetchUser"/>
+      <el-input v-model="listQuery.nickname" placeholder="用户名" clearable style="width: 200px;" class="filter-item" @keyup.enter.native="fetchUser"/>
 
       <el-select v-model="listQuery.roleId" placeholder="角色" clearable class="filter-item" >
         <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"/>
@@ -22,7 +22,7 @@
       <el-table-column label="登录账号" prop="username" align="center"/>
       <el-table-column sortable label="用户名" prop="nickname" align="center"/>
       <el-table-column sortable label="渠道" prop="channelId" align="center"/>
-      <el-table-column label="角色" prop="rank" align="center"/>
+      <!-- <el-table-column label="角色" prop="rank" align="center"/> -->
 
       <el-table-column label="角色" align="center">
         <template slot-scope="{row}">
@@ -69,14 +69,14 @@
         </el-form-item>
 
         <el-form-item label="角色" prop="roleId">
-          <el-select v-model="temp.roldId" class="filter-item" placeholder="Please select">
+          <el-select v-model="temp.roleId" class="filter-item" placeholder="Please select">
             <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
 
         <el-form-item label="用户等级" prop="rank">
           <el-select v-model="temp.rank" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in userRank" :key="item.id" :label="item.name" :value="item.id"/>
+            <el-option v-for="item in userRank" :key="item" :label="item" :value="item"/>
           </el-select>
         </el-form-item>
 
@@ -124,7 +124,6 @@ export default {
   },
   data() {
     return {
-      total: 0,
       typeOptions: [],
       temp: {},
       dialogFormVisible: false,
@@ -135,9 +134,9 @@ export default {
         create: 'Create'
       },
       users: [],
-      channels: [{ id: 159881, name: '拍拍贷' }, { id: 159878, name: '睿智' }],
-      roles: [{ id: 8, name: '量化派测试' }, { id: 9, name: '量化派开发' }],
-      userRank: [{ id: 1, name: 'OPERATOR' }, { id: 2, name: 'CHANNEL' }],
+      channels: [],
+      roles: [],
+      userRank: [],
       disabled: undefined,
       rules: {
         username: [{ required: true, message: '请输入', trigger: 'change' }],
@@ -157,6 +156,7 @@ export default {
 
   created() {
     this.fetchUser()
+    this.getRoles()
     this.disabled = !this.$store.getters.roles.includes('admin')
   },
   methods: {
@@ -168,8 +168,8 @@ export default {
       }
       this.listQuery.pageNumber = this.page - 1
       fetchUser(this.listQuery).then(res => {
-        this.count = res.totalElements
-        this.users = res.content
+        this.count = res.data.totalElements
+        this.users = res.data.content
       })
     },
 
@@ -181,7 +181,7 @@ export default {
 
     getChannels() {
       getChannelInfo().then(res => {
-        this.channels = res.data.content
+        this.channels = res.data
       })
     },
 
@@ -223,7 +223,7 @@ export default {
 
     handleUpdate(row) {
       this.temp = Object.assign({}, row) // copy obj
-      this.temp.roldId = row.roles.length > 0 ? row.roles[0].id : ''
+      this.temp.roleId = row.roles[0].id
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.$nextTick(() => {

src/views/user/roleManager.vue

@@ -110,11 +110,9 @@ export default {
         update: 'Edit',
         create: 'Create'
       },
-      roles: [{ id: 8, name: '量化派测试' }, { id: 9, name: '量化派开发' }],
-      roleList: [{ 'id': 45, 'createTime': '2020-03-04 14:27:42', 'updateTime': '2020-03-04 14:32:21', 'name': 'xxx', parent: { 'name': 'name22', id: 9 }, 'desc': '王向伟',
-        permissions: [{ id: 1, name: 'per1' }] }],
-      userRank: [{ id: 1, name: 'OPERATOR' }, { id: 2, name: 'CHANNEL' }],
-      permissions: [{ id: 1, name: 'per1' }, { id: 2, name: 'per2' }],
+      roles: [],
+      roleList: [],
+      permissions: [],
       disabled: undefined,
       rules: {
         type: [{ required: true, message: '请选择', trigger: 'change' }]
@@ -143,8 +141,8 @@ export default {
       }
       this.listQuery.pageNumber = this.page - 1
       getRoleList(this.listQuery).then(res => {
-        this.count = res.totalElements
-        this.roleList = res.content
+        this.count = res.data.totalElements
+        this.roleList = res.data.content
       })
     },