From 4bb9f72e6caf2a1a5d54d62cca3bcba2ad2de825 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 24 八月 2023 22:37:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/router/index.js | 250 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 249 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 1bcbe43..f453471 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'}
}
]
},
@@ -313,6 +382,38 @@
}
]
},
+ //涓汉璁颁簨鏈�
+ {
+ path: '/self/self',
+ component: Layout,
+ permissions: ['person:information:memo'],
+
+ hidden: true,
+ children: [
+ {
+ path: 'memo/:id(\\d+)',
+ component: () => import('@/views/self/memo'),
+ name: 'memo',
+ meta: { title: '涓汉璁颁簨鏈�'}
+ }
+ ]
+ },
+ //涓汉璁颁簨鏈缁嗕俊鎭�
+ {
+ path: '/self/self',
+ component: Layout,
+ permissions: ['person:information:memoInfo'],
+
+ hidden: true,
+ children: [
+ {
+ path: 'memoInfo/:id(\\d+)',
+ component: () => import('@/views/self/memoInfo'),
+ name: 'memoInfo',
+ meta: { title: '涓汉璁颁簨鏈缁嗕俊鎭�'}
+ }
+ ]
+ },
//璇佷功銆佽祫璐�
{
path: '/self/honor',
@@ -326,6 +427,86 @@
component: () => import('@/views/honor/honorInfo'),
name: 'honorInfo',
meta: { title: '鑽ｈ獕璇佷功璇︽儏',activeMenu: '/self/zHonor'}
+ }
+ ]
+ },
+ //淇敼鏃呮父
+ {
+ path: '/self/travel',
+ component: Layout,
+ permissions: ['person:travel:edit'],
+
+ hidden: true,
+ children: [
+ {
+ path: 'edit/:id(\\d+)',
+ component: () => import('@/views/travel/edit'),
+ name: 'edit',
+ meta: { title: '缂栬緫',activeMenu: '/geren/Ztravel'}
+ }
+ ]
+ },
+ //鏌ョ湅鏃呮父璇︽儏
+ {
+ path: '/self/travel',
+ component: Layout,
+ hidden: true,
+ permissions: ['person:travel:info'],
+ children: [
+ {
+ path: 'Info/:id',
+ component: () => import('@/views/travel/Info'),
+ name: 'show',
+ meta: { title: '鏌ョ湅璇︽儏',activeMenu: '/geren/Ztravel'}
+ }
+ ]
+ },
+ //鏌ョ湅鏃呮父缁忓巻璇︽儏
+ {
+ path: '/self/travel',
+ component: Layout,
+ hidden: true,
+ permissions: ['person:travelbase:info'],
+ children: [
+ {
+ path: 'travelInfo/:id',
+ component: () => import('@/views/travel/travelInfo'),
+ name: 'show',
+ meta: { title: '鏌ョ湅鏃呮父缁忓巻璇︽儏',activeMenu: '/geren/Ztravel'}
+ }
+ ]
+ },
+ //涓汉璐骇
+ {
+ path: '/self/selfeconomy',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['person:selfeconomy:info'],
+
+ children: [
+ {
+ path: 'selfeconomyInfo/:id(\\d+)',
+ component: () => import('@/views/selfeconomy/selfeconomyInfo'),
+ name: 'selfeconomyInfo',
+ meta: { title: '涓汉璐骇璇︽儏',activeMenu: '/self/zProperty'}
+ }
+ ]
+ },
+ //璐骇澶囧繕鏈�
+ {
+ 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'}
}
]
},
@@ -346,7 +527,74 @@
}
]
},
+ //鍋ュ悍淇濆仴
+ {
+ path: '/self/healthy',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['person:health:info'],
+ children: [
+ {
+ path: 'healthyInfo/:id(\\d+)',
+ component: () => import('@/views/healthy/healthyInfo'),
+ name: 'healthyInfo',
+ meta: { title: '鍋ュ悍淇濆仴璇︽儏',activeMenu: '/self/zYear'}
+ }
+ ]
+ },
+ //骞村害鍋ュ悍妫�鏌ユ姤鍛�
+ {
+ 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',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['person:secret:info'],
+
+ children: [
+ {
+ path: 'secretInfo/:id(\\d+)',
+ component: () => import('@/views/secret/secretInfo'),
+ name: 'secretInfo',
+ meta: { title: '闅愮璇︽儏',activeMenu: '/self/zsecret'}
+ }
+ ]
+ },
+ //闅愮澶囧繕鏈�
+ {
+ 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