From 1c0863efe062af3ebcdecb8c10568d779f5c8295 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 26 一月 2026 15:10:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New' into dev_tide_mis_xindao
---
src/router/index.js | 378 ++++++++++++++++++++++++++++--------------------------
1 files changed, 196 insertions(+), 182 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index bc7fd70..f5920d7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,182 +1,196 @@
-import { createWebHistory, createRouter } from "vue-router";
-/* Layout */
-import Layout from "@/layout";
-
-/**
- * Note: 璺敱閰嶇疆椤�
- *
- * hidden: true // 褰撹缃� true 鐨勬椂鍊欒璺敱涓嶄細鍐嶄晶杈规爮鍑虹幇 濡�401锛宭ogin绛夐〉闈紝鎴栬�呭涓�浜涚紪杈戦〉闈�/edit/1
- * alwaysShow: true // 褰撲綘涓�涓矾鐢变笅闈㈢殑 children 澹版槑鐨勮矾鐢卞ぇ浜�1涓椂锛岃嚜鍔ㄤ細鍙樻垚宓屽鐨勬ā寮�--濡傜粍浠堕〉闈�
- * // 鍙湁涓�涓椂锛屼細灏嗛偅涓瓙璺敱褰撳仛鏍硅矾鐢辨樉绀哄湪渚ц竟鏍�--濡傚紩瀵奸〉闈�
- * // 鑻ヤ綘鎯充笉绠¤矾鐢变笅闈㈢殑 children 澹版槑鐨勪釜鏁伴兘鏄剧ず浣犵殑鏍硅矾鐢�
- * // 浣犲彲浠ヨ缃� alwaysShow: true锛岃繖鏍峰畠灏变細蹇界暐涔嬪墠瀹氫箟鐨勮鍒欙紝涓�鐩存樉绀烘牴璺敱
- * redirect: noRedirect // 褰撹缃� noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮
- * name:'router-name' // 璁惧畾璺敱鐨勫悕瀛楋紝涓�瀹氳濉啓涓嶇劧浣跨敤<keep-alive>鏃朵細鍑虹幇鍚勭闂
- * query: '{"id": 1, "name": "ry"}' // 璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁�
- * roles: ['admin', 'common'] // 璁块棶璺敱鐨勮鑹叉潈闄�
- * permissions: ['a:a:a', 'b:b:b'] // 璁块棶璺敱鐨勮彍鍗曟潈闄�
- * meta : {
- noCache: true // 濡傛灉璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive> 缂撳瓨(榛樿 false)
- title: 'title' // 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛�
- icon: 'svg-name' // 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/assets/icons/svg
- breadcrumb: false // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: '/system/user' // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
- }
- */
-
-// 鍏叡璺敱
-export const constantRoutes = [
- {
- path: "/redirect",
- component: Layout,
- hidden: true,
- children: [
- {
- path: "/redirect/:path(.*)",
- component: () => import("@/views/redirect/index.vue"),
- },
- ],
- },
- {
- path: "/login",
- component: () => import("@/views/login"),
- hidden: true,
- },
- {
- path: "/register",
- component: () => import("@/views/register"),
- hidden: true,
- },
- {
- path: "/:pathMatch(.*)*",
- component: () => import("@/views/error/404"),
- hidden: true,
- },
- {
- path: "/401",
- component: () => import("@/views/error/401"),
- hidden: true,
- },
-
- {
- path: "",
- component: Layout,
- redirect: "/index",
- children: [
- {
- path: "/index",
- component: () => import("@/views/index"),
- name: "Index",
- meta: { title: "棣栭〉", icon: "dashboard", affix: true },
- },
- ],
- },
- {
- path: "/user",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- children: [
- {
- 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 = [
- {
- 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" },
- },
- ],
- },
-];
-
-const router = createRouter({
- history: createWebHistory(),
- routes: constantRoutes,
- scrollBehavior(to, from, savedPosition) {
- if (savedPosition) {
- return savedPosition;
- }
- return { top: 0 };
- },
-});
-
-export default router;
+import { createWebHistory, createRouter } from "vue-router";
+/* Layout */
+import Layout from "@/layout";
+
+/**
+ * Note: 璺敱閰嶇疆椤�
+ *
+ * hidden: true // 褰撹缃� true 鐨勬椂鍊欒璺敱涓嶄細鍐嶄晶杈规爮鍑虹幇 濡�401锛宭ogin绛夐〉闈紝鎴栬�呭涓�浜涚紪杈戦〉闈�/edit/1
+ * alwaysShow: true // 褰撲綘涓�涓矾鐢变笅闈㈢殑 children 澹版槑鐨勮矾鐢卞ぇ浜�1涓椂锛岃嚜鍔ㄤ細鍙樻垚宓屽鐨勬ā寮�--濡傜粍浠堕〉闈�
+ * // 鍙湁涓�涓椂锛屼細灏嗛偅涓瓙璺敱褰撳仛鏍硅矾鐢辨樉绀哄湪渚ц竟鏍�--濡傚紩瀵奸〉闈�
+ * // 鑻ヤ綘鎯充笉绠¤矾鐢变笅闈㈢殑 children 澹版槑鐨勪釜鏁伴兘鏄剧ず浣犵殑鏍硅矾鐢�
+ * // 浣犲彲浠ヨ缃� alwaysShow: true锛岃繖鏍峰畠灏变細蹇界暐涔嬪墠瀹氫箟鐨勮鍒欙紝涓�鐩存樉绀烘牴璺敱
+ * redirect: noRedirect // 褰撹缃� noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮
+ * name:'router-name' // 璁惧畾璺敱鐨勫悕瀛楋紝涓�瀹氳濉啓涓嶇劧浣跨敤<keep-alive>鏃朵細鍑虹幇鍚勭闂
+ * query: '{"id": 1, "name": "ry"}' // 璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁�
+ * roles: ['admin', 'common'] // 璁块棶璺敱鐨勮鑹叉潈闄�
+ * permissions: ['a:a:a', 'b:b:b'] // 璁块棶璺敱鐨勮彍鍗曟潈闄�
+ * meta : {
+ noCache: true // 濡傛灉璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive> 缂撳瓨(榛樿 false)
+ title: 'title' // 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛�
+ icon: 'svg-name' // 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/assets/icons/svg
+ breadcrumb: false // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: '/system/user' // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ }
+ */
+
+// 鍏叡璺敱
+export const constantRoutes = [
+ {
+ path: "/redirect",
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: "/redirect/:path(.*)",
+ component: () => import("@/views/redirect/index.vue"),
+ },
+ ],
+ },
+ {
+ path: "/login",
+ component: () => import("@/views/login"),
+ hidden: true,
+ },
+ {
+ path: "/register",
+ component: () => import("@/views/register"),
+ hidden: true,
+ },
+ {
+ path: "/:pathMatch(.*)*",
+ component: () => import("@/views/error/404"),
+ hidden: true,
+ },
+ {
+ path: "/401",
+ component: () => import("@/views/error/401"),
+ hidden: true,
+ },
+
+ {
+ path: "",
+ component: Layout,
+ redirect: "/index",
+ children: [
+ {
+ path: "/index",
+ component: () => import("@/views/index"),
+ name: "Index",
+ meta: { title: "棣栭〉", icon: "dashboard", affix: true },
+ },
+ ],
+ },
+ {
+ path: "/user",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ children: [
+ {
+ 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" },
+ },
+ // 娣诲姞椤圭洰璇︽儏椤甸潰璺敱閰嶇疆
+ {
+ path: "/oaSystem/projectManagement/projectDetail",
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: ":projectId",
+ component: () => import("@/views/oaSystem/projectManagement/projectDetail.vue"),
+ name: "ProjectDetail",
+ meta: { title: "椤圭洰璇︽儏", activeMenu: "/oaSystem/projectManagement" },
+ },
+ ],
+ },
+];
+
+// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
+export const dynamicRoutes = [
+ {
+ 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" },
+ },
+ ],
+ },
+];
+
+const router = createRouter({
+ history: createWebHistory(),
+ routes: constantRoutes,
+ scrollBehavior(to, from, savedPosition) {
+ if (savedPosition) {
+ return savedPosition;
+ }
+ return { top: 0 };
+ },
+});
+
+export default router;
--
Gitblit v1.9.3