提交merge1.3

openhis-ui-vue3/src/router/index.js

@@ -1,6 +1,7 @@
-import { createWebHistory, createRouter } from 'vue-router'
+import { createWebHistory, createRouter } from 'vue-router';
 /* Layout */
-import Layout from '@/layout'
+import Layout from '@/layout';
+import { path } from 'd3';
 
 /**
  * Note: 路由配置项说明
@@ -34,27 +35,35 @@ export const constantRoutes = [
     children: [
       {
         path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect/index.vue')
-      }
-    ]
+        component: () => import('@/views/redirect/index.vue'),
+      },
+    ],
   },
   // 登录路由
   {
     path: '/login',
     component: () => import('@/views/login'),
-    hidden: true
+    hidden: true,
   },
   // 注册路由
   {
     path: '/register',
     component: () => import('@/views/register'),
-    hidden: true
+    hidden: true,
   },
+<<<<<<< HEAD
   // 401权限不足路由
+=======
+  {
+    path: '/:pathMatch(.*)*',
+    component: () => import('@/views/error/404'),
+    hidden: true,
+  },
+>>>>>>> v1.3
   {
     path: '/401',
     component: () => import('@/views/error/401'),
-    hidden: true
+    hidden: true,
   },
   // 首页路由
   {
@@ -66,11 +75,15 @@ export const constantRoutes = [
         path: '/index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
+        meta: { title: '首页', icon: 'dashboard', affix: true },
+      },
+    ],
   },
+<<<<<<< HEAD
   // 个人中心路由
+=======
+
+>>>>>>> v1.3
   {
     path: '/user',
     component: Layout,
@@ -81,6 +94,7 @@ export const constantRoutes = [
         path: 'profile',
         component: () => import('@/views/system/user/profile/index'),
         name: 'Profile',
+<<<<<<< HEAD
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
@@ -113,6 +127,17 @@ export const constantRoutes = [
   //   ]
   // }
 ]
+=======
+        meta: { title: '个人中心', icon: 'user' },
+      },
+    ],
+  },
+  {
+    path: '/tpr',
+    component: () => import('@/views/inpatientNurse/tprSheet/index.vue'),
+  },
+];
+>>>>>>> v1.3
 
 // 动态路由 - 基于用户权限动态加载的路由
 export const dynamicRoutes = [
@@ -257,9 +282,15 @@ 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
   },
   //租户合同管理路由
   {
@@ -272,6 +303,7 @@ export const dynamicRoutes = [
         path: 'set/:tenantId(\\d+)',
         component: () => import('@/views/system/tenant/setContract'),
         name: 'SetContract',
+<<<<<<< HEAD
         meta: { title: '合同管理', activeMenu: '/system/tenant' }
       }
     ]
@@ -396,6 +428,83 @@ export const dynamicRoutes = [
   //   ]
   // }
 ]
+=======
+        meta: { title: '合同管理', activeMenu: '/system/basicmanage/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/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' },
+      },
+    ],
+  },
+];
+>>>>>>> v1.3
 
 // 合并常量路由和动态路由，确保所有路由都能被访问
 const allRoutes = [...constantRoutes, ...dynamicRoutes];
@@ -414,9 +523,9 @@ const router = createRouter({
   scrollBehavior(to, from, savedPosition) {
     // 页面滚动行为：如果有保存的位置则恢复，否则滚动到顶部
     if (savedPosition) {
-      return savedPosition
+      return savedPosition;
     } else {
-      return { top: 0 }
+      return { top: 0 };
     }
   },
 });