前端对接接口

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs

@@ -19,11 +19,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     public class MenuController : ControllerBase
     {
         private IMenuService _menuService;
-        private IUserService _userService;
-        public MenuController(IMenuService menuService, IUserService userService)
+        public MenuController(IMenuService menuService)
         {
             _menuService = menuService;
-            _userService =userService;
         }
         /// <summary>
         /// 这个是要递归的，但是要过滤掉删除的，所以，可以写一个通用过滤掉删除的方法

Yi.Framework/Yi.Framework.Service/UserService.cs

@@ -91,9 +91,6 @@ namespace Yi.Framework.Service
 
             for (int i = menu_data.Count() - 1; i >= 0; i--)
             {
-
-                
-
                 if (!allMenuIds.Contains(menu_data[i].id) || menu_data[i].is_delete == (short)Common.Enum.DelFlagEnum.Deleted || menu_data[i].is_show == (short)Common.Enum.ShowFlagEnum.NoShow)
                 {
                     menu_data.Remove(menu_data[i]);
@@ -116,6 +113,10 @@ namespace Yi.Framework.Service
 
             for (int i = menu_data.Count() - 1; i >= 0; i--)
             {
+                if (menu_data[i].icon == null)
+                {
+                    menu_data[i].icon = "mdi-view-dashboard";
+                }
                 if (menu_data[i].children.Count() == 0)
                 {
                     menu_data[i].children = null; 

Yi.Vue/src/api/menuApi.js

@@ -1,8 +1,8 @@
 import myaxios from '@/util/myaxios'
 export default {
-    getMenu() {
+    GetMenuInMould() {
         return myaxios({
-            url: '/Menu/GetMenu',
+            url: '/Menu/GetMenuInMould',
             method: 'get'
         })
     },
@@ -27,9 +27,9 @@ export default {
             data: ids
         })
     },
-    addMenu(data) {
+    AddTopMenu(data) {
         return myaxios({
-            url: '/Menu/addMenu',
+            url: '/Menu/AddTopMenu',
             method: 'post',
             data: data
         })

Yi.Vue/src/api/roleApi.js

@@ -13,11 +13,17 @@ export default {
             data: { ids1: roleList, ids2: menuList }
         })
     },
-    getMenuByRloe(roleId) {
+    GetTopMenusByRoleId(roleId) {
         return myaxios({
-            url: `/Role/getMenuByRloe?roleId=${roleId}`,
+            url: `/Role/GetTopMenusByRoleId?roleId=${roleId}`,
             method: 'get'
 
         })
-    }
+    },
+    GetRolesByUserId(userId) {
+        return myaxios({
+            url: `/Role/GetRolesByUserId?userId=${userId}`,
+            method: 'get'
+        })
+    },
 }

Yi.Vue/src/api/userApi.js

@@ -8,18 +8,8 @@ export default {
         })
     },
 
-    GetRolesByHttpUser() {
-        return myaxios({
-            url: '/User/GetRolesByHttpUser',
-            method: 'get'
-        })
-    },
-    GetRolesByUserId(userId) {
-        return myaxios({
-            url: `/User/GetRolesByUserId?userId=${userId}`,
-            method: 'get'
-        })
-    },
+
+
     GetUserInRolesByHttpUser() {
         return myaxios({
             url: `/User/GetUserInRolesByHttpUser`,
@@ -34,7 +24,7 @@ export default {
     },
     GetAxiosByRouter(router) {
         return myaxios({
-            url: `/User/GetRouterByUserId?router=${router}`,
+            url: `/User/GetAxiosByRouter?router=${router}`,
             method: 'get'
         })
     }

Yi.Vue/src/components/ccTreeview.vue

@@ -168,8 +168,8 @@ export default {
         this.mouldList = resp.data;
       });
 
-      menuApi.getMenu().then((resp) => {
-        this.desserts = resp.data;
+      menuApi.GetMenuInMould().then((resp) => {
+        this.desserts =[ resp.data];
       });
       this.$nextTick(() => {
         this.editedItem = Object.assign({}, this.defaultItem);
@@ -187,7 +187,7 @@ export default {
         menuApi.UpdateMenu(this.editedItem).then(() => this.init());
       } else {
         if (this.parentId == 0) {
-          menuApi.addMenu(this.editedItem).then(() => {
+          menuApi.AddTopMenu(this.editedItem).then(() => {
             this.init();
           });
         } else {

Yi.Vue/src/layouts/default/Drawer.vue

@@ -53,8 +53,8 @@ import userApi from '@/api/userApi'
 export default {
   methods: {
     init(){
-  userApi.GetMenuByUserId().then((resp)=>{
-    this.items=resp.data;
+  userApi.GetMenuByHttpUser().then((resp)=>{
+    this.items=resp.data.children;
   })
 },
     logout() {

Yi.Vue/src/views/AdmMould.vue

@@ -16,7 +16,7 @@ export default {
 created(){this.init()},
 methods:{
   init(){
-         userApi.GetRouterByUserId(this.$route.path).then(resp=>{
+         userApi.GetAxiosByRouter(this.$route.path).then(resp=>{
        this.axiosUrls=resp.data;
   })
   }

Yi.Vue/src/views/AdmRole.vue

@@ -19,7 +19,7 @@ export default {
   },
   methods: {
     init() {
-     userApi.GetRouterByUserId(this.$route.path).then(resp=>{
+     userApi.GetAxiosByRouter(this.$route.path).then(resp=>{
        this.axiosUrls=resp.data;
      })
       

Yi.Vue/src/views/AdmRoleMenu.vue

@@ -64,7 +64,7 @@ export default {
     selectionRole: {
       handler(val, oldVal) {
         if (val.length == 1) {
-          roleApi.getMenuByRloe(val[0].id).then((resp) => {
+          roleApi.GetTopMenusByRoleId(val[0].id).then((resp) => {
             this.selectionMenu = resp.data;
           });
         }
@@ -98,8 +98,8 @@ export default {
         this.RoleItems = resp.data;
       });
 
-      menuApi.getMenu().then((resp) => {
-        this.Menuitems = resp.data;
+      menuApi.GetMenuInMould().then((resp) => {
+        this.Menuitems = [resp.data];
       });
     },
   },

Yi.Vue/src/views/AdmUser.vue

@@ -36,7 +36,7 @@ export default {
   methods: {
     async showItem(item) {
       var strInfo = "";
-      userApi.GetRolesByUserId(item.id).then(async (resp) => {
+      roleApi.GetRolesByUserId(item.id).then(async (resp) => {
         const roleData = resp.data;
         strInfo += "拥有的角色:<br>";
         roleData.forEach((u) => {
@@ -58,7 +58,7 @@ export default {
       });
     },
     init() {
-      userApi.GetRouterByUserId(this.$route.path).then((resp) => {
+      userApi.GetAxiosByRouter(this.$route.path).then((resp) => {
         this.axiosUrls = resp.data;
       });
       roleApi.getRole().then((resp) => {

Yi.Vue/src/views/userInfo.vue

@@ -289,13 +289,13 @@ export default {
     },
     init() {
       this.newPassword="";
-      userApi.GetUserInfoById().then((resp) => {
+      userApi.GetUserInRolesByHttpUser().then((resp) => {
         this.userInfo = resp.data;
         this.userInfo.password="";
       this.editInfo= Object.assign({}, this.userInfo);
       });
 
-      menuApi.geTopMenuByUser().then(resp=>{
+      menuApi.GetTopMenusByHttpUser().then(resp=>{
 this.menuInfo=resp.data;
       })
     },