From 3c0b2d339126e2cb57cb25616a7bc3c9e52c11df Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期六, 27 五月 2023 10:10:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-ui/src/router/index.js |  201 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 195 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 1f34a9d..d6089d5 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -113,35 +113,224 @@
     ]
   },
     {
-    path: '/family/note1',
+    path: '/familymodel/Property',
     component: Layout,
-    permissions: ['family:note:list'],
-
     hidden: true,
+    permissions: ['familymodel:property:info'],
+
+
     children: [
       {
         path: 'propertyInfo/:id(\\d+)',
         component: () => import('@/views/note/propertyInfo'),
         name: 'propertyInfo',
-        meta: { title: '鏌ヨ璇︽儏'}
+        meta: { title: '瀹跺涵璧勪骇鏌ヨ璇︽儏', activeMenu: '/familymodel/zfProperty' }
       }
     ]
   },
 //瀹跺ぇ浜嬭鐨勮鎯�
   {
-    path: '/family1/bignote',
+    path: '/familymodel/bignote',
     component: Layout,
     // permissions: [],
     hidden: true,
+    permissions: ['familymodel:bignote:list'],
+
     children: [
       {
         path: 'familyeventInfo/:id(\\d+)',
         component: () => import('@/views/bignote/familyeventInfo'),
         name: 'familyeventInfo',
-        meta: { title: '鏌ヨ璇︽儏'}
+        meta: { title: '瀹跺ぇ浜嬭鏌ヨ璇︽儏',activeMenu: '/familymodel/zfEvent'}
       }
     ]
   },
+  //閫氳褰曡鎯�
+    {
+      path: '/familymodel/Contact',
+      component: Layout,
+      // permissions: [],
+      hidden: true,
+      permissions: ['familymodel:contact:info'],
+
+      children: [
+        {
+          path: 'contactsInfo/:id(\\d+)',
+          component: () => import('@/views/contacts/contactsInfo'),
+          name: 'contactsInfo',
+          meta: { title: '閫氳褰曟煡璇㈣鎯�',activeMenu: '/familymodel/zfContact'}
+        }
+      ]
+    },
+//瀹跺涵璁惧
+  {
+    path: '/familymodel/Device',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['familymodel:device:info'],
+
+    children: [
+      {
+        path: 'equipmentInfo/:id(\\d+)',
+        component: () => import('@/views/device/equipmentInfo'),
+        name: 'equipmentInfo',
+        meta: { title: '瀹跺涵璁惧鏌ヨ璇︽儏',activeMenu: '/familymodel/zfDevice'}
+      }
+    ]
+  },
+  //钘忓績瀵嗚
+  {
+    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',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['familymodel:economy:info'],
+
+    children: [
+      {
+        path: 'economyInfo/:id(\\d+)',
+        component: () => import('@/views/economy/economyInfo'),
+        name: 'economyInfo',
+        meta: { title: '瀹跺涵鏀舵敮鍙拌处鏌ヨ璇︽儏',activeMenu: '/familymodel/zfEconomy'}
+      }
+    ]
+  },
+//淇濇磥鏀剁撼
+  {
+    path: '/familymodel/clean',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['familymodel:clean:info'],
+
+    children: [
+      {
+        path: 'cleanInfo/:id(\\d+)',
+        component: () => import('@/views/clean/cleanInfo'),
+        name: 'cleanInfo',
+        meta: { title: '淇濇磥鏀剁撼鏌ヨ璇︽儏',activeMenu: '/familymodel/zfClean'}
+      }
+    ]
+  },
+  //鏀惰棌鍜岃崳瑾�
+  {
+    path: '/familymodel/Collection',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['familymodel:collection:info'],
+
+    children: [
+      {
+        path: 'collectionInfo/:id(\\d+)',
+        component: () => import('@/views/collection/collectionInfo'),
+        name: 'collectionInfo',
+        meta: { title: '鏀惰棌涓庤崳瑾夋煡璇㈣鎯�',activeMenu: '/familymodel/zfCollection'}
+      }
+    ]
+  },
+
+  //榄呭疇璇︽儏
+  {
+    path: '/familymodel/pet',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['familymodel:pet:info'],
+
+    children: [
+      {
+        path: 'petInfo/:pid(\\d+)',
+        component: () => import('@/views/pet/petInfo'),
+        name: 'petInfo',
+        meta: { title: '澶囧繕褰�',activeMenu: '/familymodel/zfPetNote'}
+      }
+    ]
+  },
+  //瀹跺涵灏忓尰鐢�
+  {
+    path: '/familymodel/Doctor',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['familymodel:doctor:info'],
+    children: [
+      {
+        path: 'doctorInfo/:id(\\d+)',
+        component: () => import('@/views/doctor/doctorInfo'),
+        name: 'doctorInfo',
+        meta: { title: '灏卞尰璁板綍鏌ヨ璇︽儏',activeMenu: '/familymodel/zfDoctor'}
+      }
+    ]
+  },
+ //涓汉淇℃伅灞曠ず
+  {
+    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'}
+      }
+    ]
+  },
+
+  //缂栬緫涓汉淇℃伅
+  {
+    path: '/self/self',
+    component: Layout,
+    permissions: ['person:information:edit'],
+
+    hidden: true,
+    children: [
+      {
+        path: 'edit/:id(\\d+)',
+        component: () => import('@/views/self/edit'),
+        name: 'edit',
+        meta: { title: '缂栬緫'}
+      }
+    ]
+  },
+
   {
     path: '/system/role-auth',
     component: Layout,

--
Gitblit v1.9.1