代码更新

nladmin-ui/src/api/system/role.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 获取所有的Role
 export function getAll() {
   return request({
-    url: 'api/roles/all',
+    url: 'api/sysRole/all',
     method: 'get'
   })
 }
 
 export function add(data) {
   return request({
-    url: 'api/roles',
+    url: 'api/sysRole',
     method: 'post',
     data
   })
@@ -18,21 +18,21 @@ export function add(data) {
 
 export function get(id) {
   return request({
-    url: 'api/roles/' + id,
+    url: 'api/sysRole/' + id,
     method: 'get'
   })
 }
 
 export function getLevel() {
   return request({
-    url: 'api/roles/level',
+    url: 'api/sysRole/level',
     method: 'get'
   })
 }
 
 export function del(ids) {
   return request({
-    url: 'api/roles',
+    url: 'api/sysRole',
     method: 'delete',
     data: ids
   })
@@ -40,7 +40,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/roles',
+    url: 'api/sysRole',
     method: 'put',
     data
   })
@@ -48,7 +48,7 @@ export function edit(data) {
 
 export function editMenu(data) {
   return request({
-    url: 'api/roles/menu',
+    url: 'api/sysRole/menu',
     method: 'put',
     data
   })

nladmin-ui/src/components/Crud/crud.js

@@ -140,13 +140,14 @@ function CRUD(options) {
         crud.loading = true
         // 请求数据
         initData(crud.url, crud.getQueryParams()).then(data => {
+          console.log(data)
           const table = crud.getTable()
           if (table && table.lazy) { // 懒加载子节点数据，清掉已加载的数据
             table.store.states.treeData = {}
             table.store.states.lazyTreeNodeMap = {}
           }
-          crud.page.total = data.totalElements
-          crud.data = data.content
+          crud.page.total = data.total
+          crud.data = data.records
           crud.resetDataStatus()
           // time 毫秒后显示表格
           setTimeout(() => {

nladmin-ui/src/views/system/param/index.vue

@@ -75,11 +75,11 @@ const defaultForm = {
   name: null,
   value: null,
   remark: null,
-  is_active: 1,
-  create_name: null,
-  create_time: null,
-  update_optname: null,
-  update_time: null
+  isActive: 1,
+  createName: null,
+  createTime: null,
+  updateOptname: null,
+  updateTime: null
 }
 export default {
   name: 'Param',

nladmin-ui/src/views/system/role/index.vue

@@ -31,7 +31,7 @@
           <el-input v-model="form.name" style="width: 380px;"/>
         </el-form-item>
         <el-form-item label="备注" prop="description">
-          <el-input v-model="form.description" style="width: 380px;" rows="2" type="textarea"/>
+          <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -57,7 +57,7 @@
           >
             <el-table-column type="selection" width="55"/>
             <el-table-column prop="name" label="名称" min-width="100" show-overflow-tooltip/>
-            <el-table-column show-overflow-tooltip prop="description" label="描述"/>
+            <el-table-column show-overflow-tooltip prop="remark" label="描述"/>
             <el-table-column show-overflow-tooltip width="135px" prop="createTime" label="创建日期">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -131,12 +131,12 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 
-const defaultForm = { role_id: null, name: null, description: null }
+const defaultForm = { roleId: null, name: null, remark: null }
 export default {
   name: 'Role',
   components: { pagination, crudOperation, rrOperation, udOperation, crudMenu },
   cruds() {
-    return CRUD({ idField: 'role_id', title: '角色', url: 'api/roles', crudMethod: { ...crudRoles } })
+    return CRUD({ idField: 'roleId', title: '角色', url: 'api/sysRole', crudMethod: { ...crudRoles } })
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {