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 |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 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 c873d06..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,9 +341,24 @@
               component: () => import('../views/pp/glassOptimize/OptimizePrint.vue'),
             },
             {
-              path: 'optimizeMove',
-              name: 'optimizeMove',
-              component: () => import('../views/pp/glassOptimize/OptimizeMove.vue'),
+              path: 'OptimizationRectPrint',
+              name: 'OptimizationRectPrint',
+              component: () => import('../views/pp/glassOptimize/OptimizationRectPrint.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',
@@ -1217,8 +1236,8 @@
       component: () => import('../views/RegisterView.vue')
     },
     {
-      path: '/appDownLoad',
-      name: 'appDownLoad',
+      path: '/app',
+      name: 'app',
       component: () => import('../views/system/app/appDownload.vue')
     }
     

--
Gitblit v1.8.0