From b29f1588f2bb8b46df38a52cbae07ea8590f099a Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:10:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/router/index.js | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 206 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 1bd5168..fc2a3de 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -124,7 +124,7 @@
path: 'propertyInfo/:id(\\d+)',
component: () => import('@/views/note/propertyInfo'),
name: 'propertyInfo',
- meta: { title: '瀹跺涵璧勪骇鏌ヨ璇︽儏', activeMenu: '/familymodel/zfProperty' }
+ meta: { title: '瀹跺涵璧勪骇璇︾粏淇℃伅', activeMenu: '/familymodel/zfProperty' }
}
]
},
@@ -141,7 +141,7 @@
path: 'familyeventInfo/:id(\\d+)',
component: () => import('@/views/bignote/familyeventInfo'),
name: 'familyeventInfo',
- meta: { title: '瀹跺ぇ浜嬭鏌ヨ璇︽儏',activeMenu: '/familymodel/zfEvent'}
+ meta: { title: '瀹跺ぇ浜嬭璇︾粏淇℃伅',activeMenu: '/familymodel/zfEvent'}
}
]
},
@@ -158,7 +158,7 @@
path: 'contactsInfo/:id(\\d+)',
component: () => import('@/views/contacts/contactsInfo'),
name: 'contactsInfo',
- meta: { title: '閫氳褰曟煡璇㈣鎯�',activeMenu: '/familymodel/zfContact'}
+ meta: { title: '閫氳褰曡缁嗕俊鎭�',activeMenu: '/familymodel/zfContact'}
}
]
},
@@ -175,7 +175,7 @@
path: 'equipmentInfo/:id(\\d+)',
component: () => import('@/views/device/equipmentInfo'),
name: 'equipmentInfo',
- meta: { title: '瀹跺涵璁惧鏌ヨ璇︽儏',activeMenu: '/familymodel/zfDevice'}
+ meta: { title: '瀹跺涵璁惧璇︾粏淇℃伅',activeMenu: '/familymodel/zfDevice'}
}
]
},
@@ -192,7 +192,7 @@
path: 'economyInfo/:id(\\d+)',
component: () => import('@/views/economy/economyInfo'),
name: 'economyInfo',
- meta: { title: '瀹跺涵鏀舵敮鍙拌处鏌ヨ璇︽儏',activeMenu: '/familymodel/zfEconomy'}
+ meta: { title: '瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅',activeMenu: '/familymodel/zfEconomy'}
}
]
},
@@ -209,7 +209,7 @@
path: 'cleanInfo/:id(\\d+)',
component: () => import('@/views/clean/cleanInfo'),
name: 'cleanInfo',
- meta: { title: '淇濇磥鏀剁撼鏌ヨ璇︽儏',activeMenu: '/familymodel/zfClean'}
+ meta: { title: '淇濇磥鏀剁撼璇︾粏淇℃伅',activeMenu: '/familymodel/zfClean'}
}
]
},
@@ -226,7 +226,7 @@
path: 'collectionInfo/:id(\\d+)',
component: () => import('@/views/collection/collectionInfo'),
name: 'collectionInfo',
- meta: { title: '鏀惰棌涓庤崳瑾夋煡璇㈣鎯�',activeMenu: '/familymodel/zfCollection'}
+ meta: { title: '鏀惰棌涓庤崳瑾夎缁嗕俊鎭�',activeMenu: '/familymodel/zfCollection'}
}
]
},
@@ -244,7 +244,7 @@
path: 'petInfo/:pid(\\d+)',
component: () => import('@/views/pet/petInfo'),
name: 'petInfo',
- meta: { title: '澶囧繕褰�',activeMenu: '/familymodel/zfPetNote'}
+ meta: { title: '榄呭疇璇︾粏淇℃伅',activeMenu: '/familymodel/zfPetNote'}
}
]
},
@@ -260,7 +260,7 @@
path: 'doctorInfo/:id(\\d+)',
component: () => import('@/views/doctor/doctorInfo'),
name: 'doctorInfo',
- meta: { title: '灏卞尰璁板綍鏌ヨ璇︽儏',activeMenu: '/familymodel/zfDoctor'}
+ meta: { title: '灏卞尰璁板綍璇︾粏淇℃伅',activeMenu: '/familymodel/zfDoctor'}
}
]
},
@@ -276,7 +276,7 @@
path: 'personInfo/:id(\\d+)',
component: () => import('@/views/homeRoot/personInfo'),
name: 'personInfo',
- meta: { title: '涓汉淇℃伅鏌ヨ璇︽儏',activeMenu: '/familymodel/jiagenwang'}
+ meta: { title: '涓汉璇︾粏淇℃伅',activeMenu: '/familymodel/jiagenwang'}
}
]
},
@@ -292,7 +292,7 @@
path: 'getPInfo/:id(\\d+)',
component: () => import('@/views/genealogy/perInfo'),
name: 'perInfo',
- meta: { title: '涓汉淇℃伅鏌ヨ璇︽儏',activeMenu: '/familymodel/jiagenwang'}
+ meta: { title: '瀹惰氨涓汉璇︾粏淇℃伅',activeMenu: '/familymodel/jiagenwang'}
}
]
},
@@ -313,7 +313,202 @@
}
]
},
+ //涓汉璁颁簨鏈�
+ {
+ 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',
+ component: Layout,
+ hidden: true,
+ permissions: ['self:honor:info'],
+
+ children: [
+ {
+ path: 'honorInfo/:id(\\d+)',
+ 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'}
+ }
+ ]
+ },
+ //鐧惧勾蹇冩効
+ {
+ path: '/self/wish',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['self:wish:info'],
+
+ children: [
+ {
+ path: 'wishInfo/:id(\\d+)',
+ component: () => import('@/views/wish/wishInfo'),
+ name: 'wishInfo',
+ meta: { title: '鐧惧勾蹇冩効璇︾粏淇℃伅',activeMenu: '/self/zIdea'}
+ }
+ ]
+ },
+ //鍋ュ悍淇濆仴
+ {
+ 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/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