From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index a6e9bf9..941701c 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -61,6 +61,10 @@
}
]
},
+{
+ path: '/main/glassOptimize/MoveManage',
+ component: () => import('@/views/pp/glassOptimize/MoveManage.vue')
+ },
{
path:'userPassWord',
name: 'userPassWord',
@@ -337,14 +341,29 @@
component: () => import('../views/pp/glassOptimize/OptimizePrint.vue'),
},
{
- path: '/projectDetail/:projectNo',
- name: 'projectDetail',
- component: () => import('../views/pp/glassOptimize/OptimizeProject.vue'),
+ path: 'OptimizationRectPrint',
+ name: 'OptimizationRectPrint',
+ component: () => import('../views/pp/glassOptimize/OptimizationRectPrint.vue'),
},
{
- path: '/glassInventory/:thickNess/:model',
- name: 'glassInventory',
- component: () => import('../views/pp/glassOptimize/OptimizeProject.vue'),
+ path: 'OptimizeControl',
+ name: 'OptimizeControl',
+ component: () => import('../views/pp/glassOptimize/OptimizeControl.vue'),
+ },
+ {
+ path: 'Optimization',
+ name: 'Optimization',
+ component: () => import('../views/pp/glassOptimize/Optimization.vue'),
+ },
+ {
+ path: 'optimizeparms',
+ name: 'optimizeparms',
+ component: () => import('../views/pp/glassOptimize/OptimizeParms.vue'),
+ },
+ {
+ path: '/optimizeProject/:projectNo/:thickNess/:model',
+ name: 'optimizeInfo',
+ component: () => import('../views/pp/glassOptimize/OptimizeProject.vue')
},
{
path: '',
@@ -737,6 +756,12 @@
path: 'orderPlanDecomposition',
name: 'orderPlanDecomposition',
component: () => import('../views/pp/report/OrderPlanDecomposition.vue'),
+ },
+ {
+ //璁㈠崟鎶ュ伐
+ path: 'orderReportingWorks',
+ name: 'orderReportingWorks',
+ component: () => import('../views/pp/report/OrderReportingWorks.vue'),
},
{
//宸ュ簭寰呭畬鎴�
@@ -1209,6 +1234,11 @@
path: '/register',
name: 'register',
component: () => import('../views/RegisterView.vue')
+ },
+ {
+ path: '/app',
+ name: 'app',
+ component: () => import('../views/system/app/appDownload.vue')
}
]
--
Gitblit v1.8.0