代码调整

src/api/role.js

@@ -8,14 +8,14 @@ export function fetchList(query) {
   })
 }
 
-export function getMenu(id) {
+export function getRole(id) {
   return request({
     url: '/sys/role/' + id,
     method: 'get'
   })
 }
 
-export function updateMenu(id, data) {
+export function updateRole(id, data) {
   return request({
     url: '/sys/role/update/' + id,
     method: 'post',
@@ -23,7 +23,7 @@ export function updateMenu(id, data) {
   })
 }
 
-export function createMenu(data) {
+export function createRole(data) {
   return request({
     url: '/sys/role/create',
     method: 'post',
@@ -31,10 +31,9 @@ export function createMenu(data) {
   })
 }
 
-export function deleteMenu(id) {
+export function deleteRole(id) {
   return request({
     url: '/sys/role/delete/' + id,
     method: 'post'
   })
 }
-

src/api/user.js

@@ -30,32 +30,32 @@ export function fetchList(query) {
   })
 }
 
-export function getMenu(id) {
+export function getUser(id) {
   return request({
     url: '/sys/menu/' + id,
     method: 'get'
   })
 }
 
-export function updateMenu(id, data) {
+export function updateUser(id, data) {
   return request({
-    url: '/sys/menu/update/' + id,
+    url: '/sys/user/update/' + id,
     method: 'post',
     data: data
   })
 }
 
-export function createMenu(data) {
+export function createUser(data) {
   return request({
-    url: '/sys/menu/create',
+    url: '/sys/user/create',
     method: 'post',
     data: data
   })
 }
 
-export function deleteMenu(id) {
+export function deleteUser(id) {
   return request({
-    url: '/sys/menu/delete/' + id,
+    url: '/sys/user/delete/' + id,
     method: 'post'
   })
 }

src/router/modules/sys.js

@@ -21,7 +21,7 @@ const sysRouter = {
           path: 'list',
           hidden: true,
           component: () => import('@/views/sys/menus/list.vue'),
-          name: 'SysMenus', // 隐藏的子菜单属性name可以用父级的
+          name: 'SysMenuList',
           meta: { title: '菜单列表' }
         },
         {

src/views/sys/roles/components/rolesDetail.vue

@@ -8,14 +8,7 @@
         <el-input v-model="rolesForm.roleDesc" maxlength="20" />
       </el-form-item>
       <el-form-item label="角色授权：">
-        <el-tree
-          ref="tree"
-          :data="treeData"
-          show-checkbox
-          node-key="id"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        />
+        <el-tree ref="tree" :data="treeData" show-checkbox node-key="id" :props="defaultProps" @node-click="handleNodeClick" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit('productCateFrom')">提交</el-button>
@@ -26,7 +19,7 @@
 </template>
 
 <script>
-import { updateMenu, createMenu } from '@/api/role'
+import { updateRole, createRole } from '@/api/role'
 import { sysMenuTree } from '@/api/menu'
 import { validAlphabets } from '@/utils/validate'
 
@@ -39,7 +32,7 @@ const defaultRole = {
 export default {
   name: 'ProductCateDetail',
   // components: { SingleUpload },
-  filters: { },
+  filters: {},
   props: {
     isEdit: {
       type: Boolean,
@@ -106,7 +99,8 @@ export default {
       console.log(node)
       debugger
     },
-    getSysMenuTree() { // 属性菜单
+    getSysMenuTree() {
+      // 属性菜单
       sysMenuTree().then(response => {
         this.treeData = response.data
       })
@@ -121,7 +115,7 @@ export default {
           }).then(() => {
             if (this.isEdit) {
               this.rolesForm.menuIds = this.getCheckedNodes()
-              updateMenu(this.$route.query.id, this.rolesForm).then(response => {
+              updateRole(this.$route.query.id, this.rolesForm).then(response => {
                 this.$message({
                   message: '修改成功',
                   type: 'success',
@@ -131,7 +125,7 @@ export default {
               })
             } else {
               this.rolesForm.menuIds = this.getCheckedNodes()
-              createMenu(this.rolesForm).then(response => {
+              createRole(this.rolesForm).then(response => {
                 this.$refs[formName].resetFields()
                 this.resetForm(formName)
                 this.$message({
@@ -152,7 +146,8 @@ export default {
         }
       })
     },
-    getCheckedNodes() { // 获取选中系统菜单Id
+    getCheckedNodes() {
+      // 获取选中系统菜单Id
       console.log(this.$refs.tree.getCheckedNodes())
       const res = this.$refs.tree.getCheckedNodes()
       const menuIds = res[0].id

src/views/sys/roles/list.vue

@@ -39,11 +39,11 @@
 </template>
 
 <script>
-import { fetchList, deleteMenu } from '@/api/role'
+import { fetchList, deleteRole } from '@/api/role'
 import Pagination from '@/components/Pagination'
 
 export default {
-  name: 'MenuList',
+  name: 'RoleList',
   components: { Pagination },
   filters: {
     levelFilter(value) {
@@ -120,10 +120,10 @@ export default {
       })
     },
     handleShowNextLevel(index, row) {
-      this.$router.push({ path: '/sys/roles', query: { parentId: row.id }})
+      this.$router.push({ path: '/sys/roles', query: { parentId: row.id } })
     },
     handleUpdate(index, row) {
-      this.$router.push({ path: '/sys/roles/update', query: { id: row.id }})
+      this.$router.push({ path: '/sys/roles/update', query: { id: row.id } })
     },
     handleCreate() {
       this.$router.push({ path: '/sys/roles/add' })
@@ -134,7 +134,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteMenu(row.id).then(response => {
+        deleteRole(row.id).then(response => {
           this.$message({
             message: '删除成功',
             type: 'success',

src/views/sys/users/list.vue

@@ -39,38 +39,12 @@
 </template>
 
 <script>
-import { fetchList, deleteMenu } from '@/api/user'
+import { fetchList, deleteUser } from '@/api/user'
 import Pagination from '@/components/Pagination'
 
 export default {
   name: 'UserList',
   components: { Pagination },
-  filters: {
-    levelFilter(value) {
-      if (value === 0) {
-        return '一级'
-      } else if (value === 1) {
-        return '二级'
-      }
-    },
-    iconFilter(value) {
-      if (!value) {
-        return ''
-      }
-      if (value.substr(0, 7) === 'el-icon') {
-        return '<i class="' + value + '" />'
-      } else {
-        return '<svg-icon :icon-class="' + value + '" />'
-      }
-    },
-    disableNextLevel(value) {
-      if (value === 0) {
-        return false
-      } else {
-        return true
-      }
-    }
-  },
   data() {
     return {
       tableKey: 0,
@@ -95,9 +69,6 @@ export default {
     this.getList()
   },
   methods: {
-    isElementIcon(value) {
-      return value.substr(0, 7) === 'el-icon'
-    },
     resetParentId() {
       this.listQuery.pageNum = 1
       if (this.$route.query.parentId != null) {
@@ -120,18 +91,18 @@ export default {
       })
     },
     handleUpdate(index, row) {
-      this.$router.push({ path: '/sys/users/update', query: { id: row.id }})
+      this.$router.push({ path: '/sys/users/update', query: { id: row.id } })
     },
     handleCreate() {
       this.$router.push({ path: '/sys/users/add' })
     },
     handleDelete(index, row) {
-      this.$confirm('是否要删除该菜单', '提示', {
+      this.$confirm('是否要删除该用户', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteMenu(row.id).then(response => {
+        deleteUser(row.id).then(() => {
           this.$message({
             message: '删除成功',
             type: 'success',