From ceb1dea2b24d5c3216816f42fd0e514613656416 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index ede174d..4ba8821 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -83,6 +83,23 @@
}
]
},
+ {
+ path:'userLog',
+ name: 'userLog',
+ component: () => import('../views/system/userLog/UserLog.vue'),
+ children:[
+ {
+ path: 'userListLog',
+ name: 'userListLog',
+ component: () => import('../views/system/userLog/UserListLog.vue'),
+ },
+ {
+ name:'userLog',
+ path: '',
+ redirect:'/main/userLog/userListLog'
+ }
+ ]
+ },
{
path:'glassPrice',
@@ -155,6 +172,11 @@
path: 'searchGlassType',
name: 'searchGlassType',
component: () => import('../views/sd/basicData/SearchGlassType.vue')
+ },
+ {
+ path: 'searchProcessAttributeConfig',
+ name: 'searchProcessAttributeConfig',
+ component: () => import('../views/sd/basicData/SearchProcessAttributeConfig.vue')
},
{
name: 'OrderBasicData',
@@ -750,11 +772,7 @@
name: 'selectMachine',
component: () => import('../views/pp/machine/SelectMachine.vue'),
},
- {
- path: 'addMachine',
- name: 'addMachine',
- component: () => import('../views/pp/machine/AddMachine.vue'),
- },
+
{
path: 'maintenanceAndRepair',
name: 'maintenanceAndRepair',
@@ -936,6 +954,11 @@
component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
},
{
+ path: 'addMachine',
+ name: 'addMachine',
+ component: () => import('../views/pp/productionBasicData/AddMachine.vue'),
+ },
+ {
path: '',
redirect:'/main/productionBasicData/selectProductionBasicData'
}
--
Gitblit v1.8.0