weiximei 6 år sedan
förälder
incheckning
a39132270c

+ 2
- 5
CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/SysMenuController.java Visa fil

@@ -24,11 +24,8 @@ public class SysMenuController {
24 24
 
25 25
     @RequestMapping(value = "/menu/list", method = RequestMethod.GET)
26 26
     @ApiOperation(value = "查询所有菜单", notes = "查询所有菜单")
27
-    @ApiImplicitParams({
28
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Boolean.class, name = "disabled", value = "true/false 这个值只是给element组件使用")
29
-    })
30
-    public ResponseBean getAll(@RequestParam(value = "disabled", defaultValue = "false") Boolean disabled) {
31
-        ResponseBean responseBean = iToSysMenuService.getMenuAll(disabled);
27
+    public ResponseBean getAll() {
28
+        ResponseBean responseBean = iToSysMenuService.getMenuAll();
32 29
         return responseBean;
33 30
     }
34 31
 

+ 1
- 2
CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToSysMenuService.java Visa fil

@@ -9,9 +9,8 @@ public interface IToSysMenuService {
9 9
 
10 10
     /**
11 11
      * 获取所有 菜单
12
-     * @param disabled 只是为了给element组件使用的
13 12
      * @return
14 13
      */
15
-    ResponseBean getMenuAll(boolean disabled);
14
+    ResponseBean getMenuAll();
16 15
 
17 16
 }

+ 4
- 5
CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToSysMenuServiceImpl.java Visa fil

@@ -19,9 +19,9 @@ public class ToSysMenuServiceImpl implements IToSysMenuService {
19 19
     private ToSysMenuMapper toSysMenuMapper;
20 20
 
21 21
     @Override
22
-    public ResponseBean getMenuAll(boolean disabled) {
22
+    public ResponseBean getMenuAll() {
23 23
         ResponseBean responseBean = new ResponseBean();
24
-        List<ToSysMenu> menuList = getMenu(1, 0, disabled);
24
+        List<ToSysMenu> menuList = getMenu(1, 0);
25 25
         responseBean.addSuccess(menuList);
26 26
         return responseBean;
27 27
     }
@@ -32,12 +32,11 @@ public class ToSysMenuServiceImpl implements IToSysMenuService {
32 32
      * @param menuType 菜单类型 0 页面菜单  1功能菜单
33 33
      * @return
34 34
      */
35
-    private List<ToSysMenu> getMenu (Integer parentId, Integer menuType, boolean disabled){
35
+    private List<ToSysMenu> getMenu (Integer parentId, Integer menuType){
36 36
         List<ToSysMenu> sysMenuList = toSysMenuMapper.selectParentId(parentId, menuType);
37 37
         if (CollectionUtils.isNotEmpty(sysMenuList)) {
38 38
             sysMenuList.forEach(e -> {
39
-                e.setDisabled(disabled);
40
-                e.setChildren(getMenu(e.getId(), menuType, disabled));
39
+                e.setChildren(getMenu(e.getId(), menuType));
41 40
             });
42 41
         }
43 42
         return sysMenuList;

+ 2
- 5
VUECODE/smart-operate-manage/src/api/role.js Visa fil

@@ -10,13 +10,10 @@ export function getRoleList(data) {
10 10
 }
11 11
 
12 12
 // 获取所有 菜单列表
13
-export function getMenuList(disabled) {
13
+export function getMenuList() {
14 14
   return request({
15 15
     url: '/menu/list',
16
-    method: 'get',
17
-    params: {
18
-      disabled: disabled
19
-    }
16
+    method: 'get'
20 17
   })
21 18
 }
22 19
 

+ 2
- 2
VUECODE/smart-operate-manage/src/store/modules/role.js Visa fil

@@ -12,9 +12,9 @@ const role = {
12 12
         })
13 13
       })
14 14
     },
15
-    GetMenuList({ commit }, data) { // 获取所有菜单
15
+    GetMenuList({ commit }) { // 获取所有菜单
16 16
       return new Promise((resolve, reject) => {
17
-        getMenuList(data).then(response => {
17
+        getMenuList().then(response => {
18 18
           resolve(response)
19 19
         }).catch((err) => {
20 20
           reject(err)

+ 1
- 1
VUECODE/smart-operate-manage/src/views/account/role/add/index.vue Visa fil

@@ -100,7 +100,7 @@ export default {
100 100
       console.log(data, checked, indeterminate)
101 101
     },
102 102
     getMenuList() { // 获取 菜单列表
103
-      this.$store.dispatch('GetMenuList', this.disabled).then((res) => {
103
+      this.$store.dispatch('GetMenuList').then((res) => {
104 104
         this.menuData = res.data
105 105
       }).catch(() => {
106 106
         console.log('error GetMenuList')

+ 3
- 2
VUECODE/smart-operate-manage/src/views/account/role/edi/index.vue Visa fil

@@ -43,7 +43,8 @@ export default {
43 43
       defaultProps: { // 设置树形节点的渲染的属性
44 44
         id: 'id',
45 45
         children: 'children',
46
-        label: 'menuName'
46
+        label: 'menuName',
47
+        disabled: true
47 48
       },
48 49
       rules: {
49 50
         roleName: [
@@ -104,7 +105,7 @@ export default {
104 105
       console.log(data, checked, indeterminate)
105 106
     },
106 107
     getMenuList() { // 获取 菜单列表
107
-      this.$store.dispatch('GetMenuList', this.disabled).then((res) => {
108
+      this.$store.dispatch('GetMenuList').then((res) => {
108 109
         this.menuData = res.data
109 110
       }).catch(() => {
110 111
         console.log('error GetMenuList')