解决合并冲突

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

@@ -1,6 +1,6 @@
-import { createWebHistory, createRouter } from 'vue-router'
+import { createWebHistory, createRouter } from 'vue-router';
 /* Layout */
-import Layout from '@/layout'
+import Layout from '@/layout';
 
 /**
  * Note: 路由配置项
@@ -34,24 +34,29 @@ 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,
+  },
+  {
+    path: '/:pathMatch(.*)*',
+    component: () => import('@/views/error/404'),
+    hidden: true,
   },
   {
     path: '/401',
     component: () => import('@/views/error/401'),
-    hidden: true
+    hidden: true,
   },
   {
     path: '',
@@ -62,10 +67,11 @@ export const constantRoutes = [
         path: '/index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
+        meta: { title: '首页', icon: 'dashboard', affix: true },
+      },
+    ],
   },
+
   {
     path: '/user',
     component: Layout,
@@ -76,6 +82,11 @@ export const constantRoutes = [
         path: 'profile',
         component: () => import('@/views/system/user/profile/index'),
         name: 'Profile',
+        meta: { title: '个人中心', icon: 'user' },
+      },
+    ],
+  },
+];
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
@@ -234,6 +245,9 @@ export const constantRoutes = [
         path: 'set/:tenantId(\\d+)',
         component: () => import('@/views/system/tenant/setUser'),
         name: 'SetUser',
+        meta: { title: '所属用户', activeMenu: '/system/basicmanage/tenant' },
+      },
+    ],
         meta: { title: '所属用户', activeMenu: '/system/tenant' }
       }
     ]
@@ -248,6 +262,9 @@ export const constantRoutes = [
         path: 'set/:tenantId(\\d+)',
         component: () => import('@/views/system/tenant/setContract'),
         name: 'SetContract',
+        meta: { title: '合同管理', activeMenu: '/system/basicmanage/tenant' },
+      },
+    ],
         meta: { title: '合同管理', activeMenu: '/system/tenant' }
       }
     ]
@@ -262,9 +279,9 @@ export const constantRoutes = [
         path: 'role/:userId(\\d+)',
         component: () => import('@/views/system/user/authRole'),
         name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
-      }
-    ]
+        meta: { title: '分配角色', activeMenu: '/system/user' },
+      },
+    ],
   },
   {
     path: '/system/role-auth',
@@ -276,9 +293,9 @@ export const constantRoutes = [
         path: 'user/:roleId(\\d+)',
         component: () => import('@/views/system/role/authUser'),
         name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
-      }
-    ]
+        meta: { title: '分配用户', activeMenu: '/system/role' },
+      },
+    ],
   },
   {
     path: '/system/dict-data',
@@ -290,9 +307,9 @@ export const constantRoutes = [
         path: 'index/:dictId(\\d+)',
         component: () => import('@/views/system/dict/data'),
         name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
-      }
-    ]
+        meta: { title: '字典数据', activeMenu: '/system/dict' },
+      },
+    ],
   },
   {
     path: '/monitor',
@@ -346,9 +363,9 @@ export const constantRoutes = [
         path: 'index/:jobId(\\d+)',
         component: () => import('@/views/monitor/job/log'),
         name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
-      }
-    ]
+        meta: { title: '调度日志', activeMenu: '/monitor/job' },
+      },
+    ],
   },
   {
     path: '/tool/gen-edit',
@@ -360,6 +377,11 @@ export const constantRoutes = [
         path: 'index/:tableId(\\d+)',
         component: () => import('@/views/tool/gen/editTable'),
         name: 'GenEdit',
+        meta: { title: '修改生成配置', activeMenu: '/tool/gen' },
+      },
+    ],
+  },
+];
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
@@ -381,9 +403,9 @@ const router = createRouter({
   routes: allRoutes,
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {
-      return savedPosition
+      return savedPosition;
     } else {
-      return { top: 0 }
+      return { top: 0 };
     }
   },
 });