diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index 42d8c6cf..462a5b06 100644 Binary files a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db and b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db differ diff --git a/Yi.Vue/src/components/ccTable.vue b/Yi.Vue/src/components/ccTable.vue index e3ae25d6..aa241eb4 100644 --- a/Yi.Vue/src/components/ccTable.vue +++ b/Yi.Vue/src/components/ccTable.vue @@ -24,7 +24,7 @@ > @@ -72,7 +72,7 @@ diff --git a/Yi.Vue/src/components/ccTreeview.vue b/Yi.Vue/src/components/ccTreeview.vue index 6e451953..586ba166 100644 --- a/Yi.Vue/src/components/ccTreeview.vue +++ b/Yi.Vue/src/components/ccTreeview.vue @@ -103,6 +103,7 @@ export default { icon: "mdi-start", router: "test", menu_name: "测试", + is_show:1 }, }), computed: { diff --git a/Yi.Vue/src/layouts/default/Drawer.vue b/Yi.Vue/src/layouts/default/Drawer.vue index cc2aae85..6e330453 100644 --- a/Yi.Vue/src/layouts/default/Drawer.vue +++ b/Yi.Vue/src/layouts/default/Drawer.vue @@ -81,7 +81,9 @@ export default { title: "用户管理", icon: "mdi-account", to: "/admuser/", - children: [], + children: [ + + ], }, { title: "角色管理", diff --git a/Yi.Vue/src/util/getMould.js b/Yi.Vue/src/util/getMould.js index 2f9e05a8..4a07ff48 100644 --- a/Yi.Vue/src/util/getMould.js +++ b/Yi.Vue/src/util/getMould.js @@ -1,17 +1,24 @@ -function getUrl(menuList, menuStr) { - for (var i = 0; i < menuList.length; i++) { - if (menuList[i].menu_name == menuStr) { - console.log(handUrl(menuList[i])) - return 1; - } else { - if (menuList[i].children != undefined) { - getUrl(menuList[i].children, menuStr); - } +var start = true; +function getUrl(menuList, menuStr) { + + if (start) { + for (var i = 0; i < menuList.length; i++) { + if (menuList[i].menu_name == menuStr) { + alert(777) + start = false; + console.log(handUrl(menuList[i])) + return handUrl(menuList[i]) + } else { + if (menuList[i].children != undefined && start) { + alert(666) + getUrl(menuList[i].children, menuStr); + } + + } } } -} - +}; function handUrl(menu) { var axiosUrls = { @@ -42,4 +49,8 @@ function handUrl(menu) { }); return axiosUrls; } -export default { getUrl } \ No newline at end of file + +export { + getUrl, + handUrl +} \ No newline at end of file diff --git a/Yi.Vue/src/views/AdmRole.vue b/Yi.Vue/src/views/AdmRole.vue index 61a79ed7..ad8d7578 100644 --- a/Yi.Vue/src/views/AdmRole.vue +++ b/Yi.Vue/src/views/AdmRole.vue @@ -12,93 +12,109 @@