wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
openhis-ui-vue3/src/router/index.js
View File

@@ -51,15 +51,11 @@ export const constantRoutes = [
component: () => import('@/views/register'),
hidden: true,
},
<<<<<<< HEAD
// 401权限不足路由
=======
{
path: '/:pathMatch(.*)*',
component: () => import('@/views/error/404'),
hidden: true,
},
>>>>>>> v1.3
{
path: '/401',
component: () => import('@/views/error/401'),
@@ -79,11 +75,6 @@ export const constantRoutes = [
},
],
},
<<<<<<< HEAD
// 个人中心路由
=======
>>>>>>> v1.3
{
path: '/user',
component: Layout,
@@ -94,40 +85,6 @@ export const constantRoutes = [
path: 'profile',
component: () => import('@/views/system/user/profile/index'),
name: 'Profile',
<<<<<<< HEAD
meta: { title: '个人中心', icon: 'user' }
}
]
},
// 套餐管理相关路由 - 添加到公共路由确保始终可用
{
path: '/maintainSystem/Inspection/PackageManagement',
component: Layout,
hidden: true,
children: [
{
path: '',
component: () => import('@/views/maintainSystem/Inspection/PackageManagement.vue'),
name: 'DirectPackageManagement',
meta: { title: '套餐管理' }
}
]
},
// {
// path: '/reservationRecord2/appoinmentmanage',
// component: Layout,
// hidden: true,
// children: [
// {
// path: '',
// component: () => import('@/views/appoinmentmanage/clinicRoom/index.vue'),
// name: 'DirectClinicRoom',
// meta: { title: '门诊出诊医生诊室设置' }
// }
// ]
// }
]
=======
meta: { title: '个人中心', icon: 'user' },
},
],
@@ -137,7 +94,6 @@ export const constantRoutes = [
component: () => import('@/views/inpatientNurse/tprSheet/index.vue'),
},
];
>>>>>>> v1.3
// 动态路由 - 基于用户权限动态加载的路由
export const dynamicRoutes = [
@@ -282,15 +238,9 @@ export const dynamicRoutes = [
path: 'set/:tenantId(\\d+)',
component: () => import('@/views/system/tenant/setUser'),
name: 'SetUser',
<<<<<<< HEAD
meta: { title: '所属用户', activeMenu: '/system/tenant' }
}
]
=======
meta: { title: '所属用户', activeMenu: '/system/basicmanage/tenant' },
},
],
>>>>>>> v1.3
},
//租户合同管理路由
{
@@ -303,132 +253,6 @@ export const dynamicRoutes = [
path: 'set/:tenantId(\\d+)',
component: () => import('@/views/system/tenant/setContract'),
name: 'SetContract',
<<<<<<< HEAD
meta: { title: '合同管理', activeMenu: '/system/tenant' }
}
]
},
// 用户角色分配路由
// {
// path: '/system/user-auth',
// component: Layout,
// hidden: true,
// permissions: ['system:user:edit'],
// children: [
// {
// path: 'role/:userId(\\d+)',
// component: () => import('@/views/system/user/authRole'),
// name: 'AuthRole',
// meta: { title: '分配角色', activeMenu: '/system/user' }
// }
// ]
// },
// // 角色用户分配路由
// {
// path: '/system/role-auth',
// component: Layout,
// hidden: true,
// permissions: ['system:role:edit'],
// children: [
// {
// path: 'user/:roleId(\\d+)',
// component: () => import('@/views/system/role/authUser'),
// name: 'AuthUser',
// meta: { title: '分配用户', activeMenu: '/system/role' }
// }
// ]
// },
// // 字典数据路由
// {
// path: '/system/dict-data',
// component: Layout,
// hidden: true,
// permissions: ['system:dict:list'],
// children: [
// {
// path: 'index/:dictId(\\d+)',
// component: () => import('@/views/system/dict/data'),
// name: 'Data',
// meta: { title: '字典数据', activeMenu: '/system/dict' }
// }
// ]
// },
// 系统监控路由
// {
// path: '/monitor',
// component: Layout,
// redirect: '/monitor/operlog',
// name: 'Monitor',
// meta: { title: '系统监控', icon: 'monitor' },
// children: [
// {
// path: 'operlog', // 操作日志路由
// component: () => import('@/views/monitor/operlog/index.vue'),
// name: 'Operlog',
// meta: { title: '操作日志', icon: 'operlog', permissions: ['monitor:operlog:list'] }
// },
// {
// path: 'logininfor', // 登录日志路由
// component: () => import('@/views/monitor/logininfor/index.vue'),
// name: 'Logininfor',
// meta: { title: '登录日志', icon: 'logininfor', permissions: ['monitor:logininfor:list'] }
// },
// {
// path: 'job', // 定时任务路由
// component: () => import('@/views/monitor/job/index.vue'),
// name: 'Job',
// meta: { title: '定时任务', icon: 'job', permissions: ['monitor:job:list'] }
// }
// ]
// },
// 系统工具路由
// {
// path: '/tool',
// component: Layout,
// redirect: '/tool/gen',
// name: 'Tool',
// meta: { title: '系统工具', icon: 'tool' },
// children: [
// {
// path: 'gen', // 代码生成路由
// component: () => import('@/views/tool/gen/index.vue'),
// name: 'Gen',
// meta: { title: '代码生成', icon: 'gen', permissions: ['tool:gen:list'] }
// }
// ]
// },
// 定时任务日志路由
// {
// path: '/monitor/job-log',
// component: Layout,
// hidden: true,
// permissions: ['monitor:job:list'],
// children: [
// {
// path: 'index/:jobId(\\d+)',
// component: () => import('@/views/monitor/job/log'),
// name: 'JobLog',
// meta: { title: '调度日志', activeMenu: '/monitor/job' }
// }
// ]
// },
// 代码生成编辑路由
// {
// path: '/tool/gen-edit',
// component: Layout,
// hidden: true,
// permissions: ['tool:gen:edit'],
// children: [
// {
// path: 'index/:tableId(\\d+)',
// component: () => import('@/views/tool/gen/editTable'),
// name: 'GenEdit',
// meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
// }
// ]
// }
]
=======
meta: { title: '合同管理', activeMenu: '/system/basicmanage/tenant' },
},
],
@@ -504,7 +328,6 @@ export const dynamicRoutes = [
],
},
];
>>>>>>> v1.3
// 合并常量路由和动态路由，确保所有路由都能被访问
const allRoutes = [...constantRoutes, ...dynamicRoutes];