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 |  123 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index e7f75b4..b4a48e2 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -112,6 +112,7 @@
       }
     ]
   },
+  //瀹跺涵璧勪骇绠＄悊
     {
     path: '/familymodel/Property',
     component: Layout,
@@ -125,6 +126,23 @@
         component: () => import('@/views/note/propertyInfo'),
         name: 'propertyInfo',
         meta: { title: '瀹跺涵璧勪骇璇︾粏淇℃伅', activeMenu: '/familymodel/zfProperty' }
+      }
+    ]
+  },
+  //瀹跺涵璧勪骇绠＄悊澶囧繕鏈�
+  {
+    path: '/familymodel/Property',
+    component: Layout,
+    hidden: true,
+    permissions: ['familymodel:property:memo'],
+
+
+    children: [
+      {
+        path: 'memo/:id(\\d+)',
+        component: () => import('@/views/note/memo'),
+        name: 'memo',
+        meta: { title: '瀹跺涵璧勪骇澶囧繕鏈�', activeMenu: '/familymodel/zfProperty' }
       }
     ]
   },
@@ -176,6 +194,23 @@
         component: () => import('@/views/device/equipmentInfo'),
         name: 'equipmentInfo',
         meta: { title: '瀹跺涵璁惧璇︾粏淇℃伅',activeMenu: '/familymodel/zfDevice'}
+      }
+    ]
+  },
+  //瀹跺涵璁惧澶囧繕鏈�
+  {
+    path: '/familymodel/Device',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['familymodel:device:memo'],
+
+    children: [
+      {
+        path: 'memo/:id(\\d+)',
+        component: () => import('@/views/device/memo'),
+        name: 'memo',
+        meta: { title: '瀹跺涵璁惧澶囧繕鏈�',activeMenu: '/familymodel/zfDevice'}
       }
     ]
   },
@@ -241,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'}
       }
     ]
   },
@@ -370,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'}
@@ -424,7 +493,23 @@
       }
     ]
   },
+  //璐骇澶囧繕鏈�
+  {
+    path: '/self/selfeconomy',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['person:selfeconomy:memo'],
 
+    children: [
+      {
+        path: 'memo/:id(\\d+)',
+        component: () => import('@/views/selfeconomy/memo'),
+        name: 'memo',
+        meta: { title: '璐骇澶囧繕鏈�',activeMenu: '/self/zProperty'}
+      }
+    ]
+  },
   //鐧惧勾蹇冩効
   {
     path: '/self/wish',
@@ -459,6 +544,23 @@
       }
     ]
   },
+  //骞村害鍋ュ悍妫�鏌ユ姤鍛�
+  {
+    path: '/self/healthy',
+    component: Layout,
+    permissions: ['person:healthy:healthYear'],
+
+    hidden: true,
+    children: [
+      {
+        path: 'healthYear/:id(\\d+)',
+        component: () => import('@/views/healthy/healthYear'),
+        name: 'healthYear',
+        meta: { title: '骞村害鍋ュ悍鎶ュ憡'}
+      }
+    ]
+  },
+
   //钘忓績瀵嗚
   {
     path: '/self/secret',
@@ -476,6 +578,23 @@
       }
     ]
   },
+  //闅愮澶囧繕鏈�
+  {
+    path: '/self/secret',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['person:secret:memo'],
+
+    children: [
+      {
+        path: 'memo/:id(\\d+)',
+        component: () => import('@/views/secret/memo'),
+        name: 'memo',
+        meta: { title: '闅愮澶囧繕鏈�',activeMenu: '/self/zsecret'}
+      }
+    ]
+  },
   {
     path: '/system/role-auth',
     component: Layout,

--
Gitblit v1.9.1