From fe37beed44df3d9f98aad764f3977b18ef557784 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期五, 26 五月 2023 20:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/router/index.js | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index a2d11cb..d6089d5 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -179,6 +179,23 @@
}
]
},
+ //钘忓績瀵嗚
+ {
+ path: '/self/secret',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['self:secret:info'],
+
+ children: [
+ {
+ path: 'secretInfo/:id(\\d+)',
+ component: () => import('@/views/secret/secretInfo'),
+ name: 'secretInfo',
+ meta: { title: '闅愮璇︽儏',activeMenu: '/self/zsecret'}
+ }
+ ]
+ },
//瀹跺涵鏀舵敮鍙拌处
{
path: '/familymodel/economy',
@@ -209,7 +226,7 @@
path: 'cleanInfo/:id(\\d+)',
component: () => import('@/views/clean/cleanInfo'),
name: 'cleanInfo',
- meta: { title: '瀹跺涵鏀舵敮鍙拌处鏌ヨ璇︽儏',activeMenu: '/familymodel/zfClean'}
+ meta: { title: '淇濇磥鏀剁撼鏌ヨ璇︽儏',activeMenu: '/familymodel/zfClean'}
}
]
},
@@ -230,19 +247,20 @@
}
]
},
- //榄呭疇澶囧繕褰�
+
+ //榄呭疇璇︽儏
{
path: '/familymodel/pet',
component: Layout,
// permissions: [],
hidden: true,
- permissions: ['familymodel:pet:list'],
+ permissions: ['familymodel:pet:info'],
children: [
{
- path: 'petnote/:pid(\\d+)',
- component: () => import('@/views/pet/petnote'),
- name: 'petnote',
+ path: 'petInfo/:pid(\\d+)',
+ component: () => import('@/views/pet/petInfo'),
+ name: 'petInfo',
meta: { title: '澶囧繕褰�',activeMenu: '/familymodel/zfPetNote'}
}
]
@@ -263,6 +281,38 @@
}
]
},
+ //涓汉淇℃伅灞曠ず
+ {
+ path: '/familymodel/jiagenwang',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['familymodel:jiagenwang:info'],
+ children: [
+ {
+ path: 'personInfo/:id(\\d+)',
+ component: () => import('@/views/homeRoot/personInfo'),
+ name: 'personInfo',
+ meta: { title: '涓汉淇℃伅鏌ヨ璇︽儏',activeMenu: '/familymodel/jiagenwang'}
+ }
+ ]
+ },
+ //瀹惰氨涓汉淇℃伅灞曠ず
+ {
+ path: '/familymodel/jiagenwang',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['familymodel:jiagenwang:getPInfo'],
+ children: [
+ {
+ path: 'getPInfo/:id(\\d+)',
+ component: () => import('@/views/genealogy/perInfo'),
+ name: 'perInfo',
+ meta: { title: '涓汉淇℃伅鏌ヨ璇︽儏',activeMenu: '/familymodel/jiagenwang'}
+ }
+ ]
+ },
//缂栬緫涓汉淇℃伅
{
--
Gitblit v1.9.1