From b8670cd94a61846ac63573f724fcf91d8dd7be88 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 29 八月 2023 21:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/router/index.js | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index fddc8d5..b4a48e2 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -276,10 +276,44 @@
children: [
{
- path: 'petInfo/:pid(\\d+)',
+ path: 'petInfo/:id(\\d+)',
component: () => import('@/views/pet/petInfo'),
name: 'petInfo',
meta: { title: '榄呭疇璇︾粏淇℃伅',activeMenu: '/familymodel/zfPetNote'}
+ }
+ ]
+ },
+ //榄呭疇澶囧繕鏈�
+ {
+ path: '/familymodel/pet',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['familymodel:pet:petnote'],
+
+ children: [
+ {
+ path: 'petnote/:id(\\d+)',
+ component: () => import('@/views/pet/petnote'),
+ name: 'petnote',
+ meta: { title: '榄呭疇澶囧繕鏈�',activeMenu: '/familymodel/zfPetNote'}
+ }
+ ]
+ },
+ //榄呭疇澶囧繕鏈鎯�
+ {
+ path: '/familymodel/pet',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['familymodel:pet:noteInfo'],
+
+ children: [
+ {
+ path: 'noteInfo/:id(\\d+)',
+ component: () => import('@/views/pet/noteInfo'),
+ name: 'petnote',
+ meta: { title: '澶囧繕鏈鎯�',activeMenu: '/familymodel/zfPetNote'}
}
]
},
@@ -405,7 +439,7 @@
hidden: true,
children: [
{
- path: 'edit/:id(\\d+)',
+ path: 'edit/:id',
component: () => import('@/views/travel/edit'),
name: 'edit',
meta: { title: '缂栬緫',activeMenu: '/geren/Ztravel'}
--
Gitblit v1.9.1