From 4ca2aeafbb3c753d98ba849fa5ebf817049b5803 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:49:13 +0800
Subject: [PATCH] 合并冲突
---
src/router/index.js | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 5913c56..9cfde33 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,14 +97,21 @@
redirect: 'noredirect',
children: [
{
- path: 'profile',
- component: () => import('@/views/system/user/profile/index'),
- name: 'Profile',
- meta: { title: '涓汉涓績', icon: 'user' }
- }
- ]
- }
-]
+ path: "profile",
+ component: () => import("@/views/system/user/profile/index"),
+ name: "Profile",
+ meta: { title: "涓汉涓績", icon: "user" },
+ },
+ ],
+ },
+ {
+ path: "/device-info",
+ component: () => import("@/views/equipmentManagement/deviceInfo/index.vue"),
+ hidden: true,
+ name: "DeviceInfo",
+ meta: { title: "璁惧淇℃伅", icon: "monitor" },
+ },
+];
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
export const dynamicRoutes = [
--
Gitblit v1.9.3