From 815ecdda5cc9a89cf4d35e3a085617fd94f3e313 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 25 四月 2023 09:22:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/router/index.js |   85 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index f9a1fb4..b16077c 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -113,33 +113,102 @@
     ]
   },
     {
-    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: [],
-    permissions: ['family1:bignote:list'],
     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: '/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/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'}
       }
     ]
   },
@@ -148,7 +217,7 @@
   {
     path: '/self/self',
     component: Layout,
-    permissions: ['self:self:list'],
+    permissions: ['person:information:edit'],
 
     hidden: true,
     children: [

--
Gitblit v1.9.1