From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/router/index.js | 114 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 35 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index bf11864..bfd49d0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,6 +46,23 @@
component: () => import("@/views/login"),
hidden: true,
},
+ // 绗笁鏂圭櫥褰曢〉
+ {
+ path: "/thirdpartylogin",
+ component: () => import("@/views/thirdpartylogin"),
+ hidden: true,
+ },
+ // 绗笁鏂圭櫥褰曢〉涓浆
+ {
+ path: "/logindemo",
+ component: () => import("@/views/logindemo"),
+ hidden: true,
+ },
+ {
+ path: "/callbacklccpn",
+ component: () => import("@/views/tideLogin.vue"),
+ hidden: true,
+ },
{
path: "/register",
component: () => import("@/views/register"),
@@ -62,7 +79,7 @@
hidden: true,
},
{
- path: "",
+ path: "/",
component: Layout,
redirect: "index",
children: [
@@ -100,12 +117,67 @@
permissions: ["business:order"],
children: [
{
- // 閾滄潗鏂欎笅鍗�
- path: "customsInspection",
+ // 鍘熸潗鏂欎笅鍗�-杩涜涓嬪崟
+ path: "customsInspectionOrder",
component: () =>
- import("@/views/business/materialOrder/customsInspection"),
- name: "customsInspection",
- meta: { title: "閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder" },
+ import("@/views/business/materialOrder/customsInspectionOrder"),
+ name: "CustomsInspectionOrder",
+ meta: {
+ title: "杩涜鍘熸潗鏂欎笅鍗�",
+ activeMenu: "/business/materialOrder",
+ keepAlive: true
+ },
+ },
+ {
+ // 鍘熸潗鏂欎笅鍗�-鏌ョ湅璇︽儏
+ path: "customsInspectionView",
+ component: () =>
+ import("@/views/business/materialOrder/customsInspectionView"),
+ name: "CustomsInspectionView",
+ meta: {
+ title: "鏌ョ湅鍘熸潗鏂欎笅鍗曡鎯�",
+ activeMenu: "/business/materialOrder",
+ keepAlive: true
+ },
+ },
+ {
+ // 閾滄潗鏂欎笅鍗�
+ path: "copperOrder",
+ component: () => import("@/views/business/materialOrder/copperOrder"),
+ name: "CopperOrder",
+ meta: { title: "杩涜閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder",keepAlive: true },
+ },
+ {
+ // 閾滄潗鏂欎笅鍗�-鏌ョ湅璇︽儏
+ path: "copperView",
+ component: () => import("@/views/business/materialOrder/copperView"),
+ name: "CopperView",
+ meta: { title: "鏌ョ湅閾滄潗鏂欎笅鍗曡鎯�", activeMenu: "/business/materialOrder",keepAlive: true },
+ },
+ ],
+ },
+ {
+ // 鎴愬搧涓嬪崟
+ path: "/productOrder",
+ component: Layout,
+ hidden: true,
+ permissions: ["business:productOrder"],
+ children: [
+ {
+ // 鏌ョ湅鎴愬搧涓嬪崟璇︽儏
+ path: "addView",
+ component: () =>
+ import("@/views/business/productOrder/components/addView.vue"),
+ name: "AddView",
+ meta: { title: "鏌ョ湅鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/productOrder",keepAlive: true },
+ },
+ {
+ // 杩涜涓嬪崟-鎴愬搧涓嬪崟
+ path: "addOrder",
+ component: () =>
+ import("@/views/business/productOrder/components/addOrder.vue"),
+ name: "AddOrder",
+ meta: { title: "杩涜鎴愬搧涓嬪崟", activeMenu: "/business/productOrder",keepAlive: true },
},
],
},
@@ -121,7 +193,7 @@
path: "inspection",
component: () => import("@/views/business/inspectionTask/inspection"),
name: "inspection",
- meta: { title: "妫�楠屽崟璇︽儏", activeMenu: "/business/inspectionTask" },
+ meta: { title: "妫�楠屽崟璇︽儏", activeMenu: "/business/inspectionTask", keepAlive: false },
},
],
},
@@ -176,34 +248,6 @@
component: Layout,
hidden: true,
permissions: ["customer:edit"],
- },
- {
- 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" },
- },
- ],
},
];
--
Gitblit v1.9.3