diff --git a/ui/dasadmin/.env.development b/ui/dasadmin/.env.development index d2cba51d..c8c70d94 100644 --- a/ui/dasadmin/.env.development +++ b/ui/dasadmin/.env.development @@ -6,9 +6,9 @@ VITE_BASE_PATH = './' # 代理配置(开发使用),必须在一行中 # 本地 -# VITE_APP_PROXY=[["/api","http://192.168.130.12:8080/api"]] + # VITE_APP_PROXY=[["/api","http://10.65.57.55:8080/api"]] # 线上 -VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]] + VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]] diff --git a/ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue b/ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue index c0de96c5..bd1e38bc 100644 --- a/ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue +++ b/ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue @@ -4,7 +4,7 @@ @@ -12,7 +12,7 @@ diff --git a/ui/dasadmin/src/layouts/backend/components/navBar/tabs.vue b/ui/dasadmin/src/layouts/backend/components/navBar/tabs.vue index f58faf08..2350b8ac 100644 --- a/ui/dasadmin/src/layouts/backend/components/navBar/tabs.vue +++ b/ui/dasadmin/src/layouts/backend/components/navBar/tabs.vue @@ -9,7 +9,7 @@ :ref="tabsRefs.set" :key="idx" > - {{ item.meta.title }} + {{ item.meta.menuDesc }} diff --git a/ui/dasadmin/src/layouts/backend/index.vue b/ui/dasadmin/src/layouts/backend/index.vue index c4d6e278..42132a9d 100644 --- a/ui/dasadmin/src/layouts/backend/index.vue +++ b/ui/dasadmin/src/layouts/backend/index.vue @@ -350,7 +350,7 @@ const menu = [ ], }, ] - +debugger function transformNode(menu: any) { menu = menu.map((node: any) => { return { @@ -358,6 +358,7 @@ function transformNode(menu: any) { pid: node.parentMenuId, type: node.children.length != 0 ? 'menu_dir' : 'menu', title: node.menuName, + menuDesc: node.menuDesc, name: node.menuName, path: node.menuName, icon: node.menuIcon, diff --git a/ui/dasadmin/src/layouts/backend/router-view/main.vue b/ui/dasadmin/src/layouts/backend/router-view/main.vue index 29c838c0..71cce13d 100644 --- a/ui/dasadmin/src/layouts/backend/router-view/main.vue +++ b/ui/dasadmin/src/layouts/backend/router-view/main.vue @@ -1,13 +1,13 @@ diff --git a/ui/dasadmin/src/utils/router.ts b/ui/dasadmin/src/utils/router.ts index 12be30bc..1e8f6030 100644 --- a/ui/dasadmin/src/utils/router.ts +++ b/ui/dasadmin/src/utils/router.ts @@ -186,6 +186,7 @@ const handleMenuRule = (routes: any, pathPrefix = '/', type = ['menu', 'menu_dir meta: { id: routes[key].id, title: routes[key].title, + menuDesc: routes[key].menuDesc, icon: routes[key].icon, keepalive: routes[key].keepalive, menu_type: routes[key].menu_type, @@ -279,6 +280,7 @@ export const addRouteItem = (viewsComponent: Record, route: any, pa component: component, meta: { title: route.title, + menuDesc: route.menuDesc, extend: route.extend, icon: route.icon, keepalive: route.keepalive, diff --git a/ui/dasadmin/src/views/backend/auth/menu/index.vue b/ui/dasadmin/src/views/backend/auth/menu/index.vue index e05c5eac..01f475b9 100644 --- a/ui/dasadmin/src/views/backend/auth/menu/index.vue +++ b/ui/dasadmin/src/views/backend/auth/menu/index.vue @@ -26,6 +26,7 @@ + @@ -56,6 +57,10 @@ + + + + @@ -102,6 +107,10 @@ + + + + @@ -225,6 +234,7 @@ interface Tree { id: number menuIcon: string menuName: string + menuDesc: string menuOrder: number parentMenuId: number revision: number @@ -266,7 +276,7 @@ const queryMenuMethod = (data: any) => { const defaultProps = { children: 'children', - label: 'menuName', + label: 'menuDesc', } // 菜单 @@ -276,6 +286,7 @@ const menuEdit = (data: any) => { fromUpDate.id = data.row.id fromUpDate.revision = data.row.revision fromUpDate.menuName = data.row.menuName + fromUpDate.menuDesc = data.row.menuDesc fromUpDate.menuOrder = data.row.menuOrder fromUpDate.menuIcon = data.row.menuIcon fromUpDate.funType = data.row.funType @@ -293,6 +304,7 @@ const handleCloseAdd = () => { interface RuleForm { menuName: string | undefined + menuDesc: string | undefined menuOrder: number menuIcon: string funType: number @@ -339,6 +351,13 @@ const rules = reactive>({ trigger: 'blur', }, ], + menuDesc: [ + { + required: true, + message: '菜单描述不能为空', + trigger: 'blur', + }, + ] }) // 动作参数 @@ -353,6 +372,7 @@ interface RyReplaceFields { const fromUpDate = reactive({ id: '', menuName: '', + menuDesc:'', menuOrder: 0, menuIcon: '', funType: 0, @@ -451,6 +471,7 @@ const visibleAdd = ref(false) const formInlineAdd = reactive({ menuName: '', + menuDesc: '', menuOrder: 0, menuIcon: '', funType: 1, @@ -470,6 +491,7 @@ const formInlineAdd = reactive({ const fromAdd = () => { visibleAdd.value = true formInlineAdd.menuName = '' + formInlineAdd.menuDesc ='' formInlineAdd.menuOrder = 0 formInlineAdd.menuIcon = '' formInlineAdd.funType = 1