From 9973bb6887f668cd91f1c4a0b8a7d05f9bd229ad Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 12 十月 2024 14:57:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES

---
 UI-Project/src/router/index.js |  247 ++++++++++++++++++++++++++-----------------------
 1 files changed, 130 insertions(+), 117 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 3c48123..a43459d 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -23,71 +23,84 @@
       name: 'main',
       component: () => import('../layout/MainErpView.vue'),
       children: [
-        // {
-        //   /*----------- 鑷姩涓婄墖 ----------------*/
-        //   path: 'UpperSlice',
-        //   name: 'upperSlice',
-        //   component: () => import('../views/UpperSlice/upperSlice.vue'),
-        //   children: [
-        //     {
-        //       path: '/UpperSlice/upperSlice',
-        //       name: 'upperSlice',
-        //       component: () => import('../views/UpperSlice/upperSlice.vue'),
-        //     }
-        //   ]
-        // },
-        // {
-        //   /*----------- 鑷姩鎵爜 ----------------*/
-        //   path: 'ScanQrCodesIdentify',
-        //   name: 'scanQrCodesIdentify',
-        //   component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
-        //   children: [
-        //     {
-        //       path: '/ScanQrCodesIdentify/scanQrCodesIdentify',
-        //       name: 'scanQrCodesIdentify',
-        //       component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
-        //     }
-        //   ]
-        // },
-        // {
-        //   /*----------- 纾ㄨ竟鏈� ----------------*/
-        //   path: 'Edging',
-        //   name: 'edging',
-        //   component: () => import('../views/Edging/edging.vue'),
-        //   children: [
-        //     {
-        //       path: '/Edging/edging',
-        //       name: 'edging',
-        //       component: () => import('../views/Edging/edging.vue'),
-        //     }
-        //   ]
-        // },
-        // {
-        //   /*----------- 娓呮礂鏈� ----------------*/
-        //   path: 'Cleaning',
-        //   name: 'cleaning',
-        //   component: () => import('../views/Cleaning/cleaning.vue'),
-        //   children: [
-        //     {
-        //       path: '/Cleaning/cleaning',
-        //       name: 'cleaning',
-        //       component: () => import('../views/Cleaning/cleaning.vue'),
-        //     }
-        //   ]
-        // },flipSlice
-        // {
-        //   /*----------- 缈荤墖鍙� ----------------*/
-        //   path: 'FlipSlice',
-        //   name: 'flipSlice',
-        //   component: () => import('../views/FlipSlice/flipSlice.vue'),
-        //   children: [
-        //     {
-        //       path: '/FlipSlice/flipSlice',
-        //       name: 'flipSlice',
-        //       component: () => import('../views/FlipSlice/flipSlice.vue'),
-        //     }
-        //   ]
-        // },
+        {
+          /*----------- 鑷姩涓婄墖 ----------------*/
+          path: 'MechanicalArm',
+          name: 'mechanicalArm',
+          component: () => import('../views/MechanicalArm/mechanicalArm.vue'),
+          children: [
+            {
+              path: '/mechanicalArm/mechanicalArm',
+              name: 'mechanicalArm',
+              component: () => import('../views/MechanicalArm/mechanicalArm.vue'),
+            }
+          ]
+        },
+        {
+          /*----------- 鑷姩鎵爜 ----------------*/
+          path: 'ScanQrCodesIdentify',
+          name: 'scanQrCodesIdentify',
+          component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
+          children: [
+            {
+              path: '/ScanQrCodesIdentify/scanQrCodesIdentify',
+              name: 'scanQrCodesIdentify',
+              component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
+            }
+          ]
+        },
+        {
+          /*----------- 纾ㄨ竟鏈� ----------------*/
+          path: 'Edging',
+          name: 'edging',
+          component: () => import('../views/Edging/edging.vue'),
+          children: [
+            {
+              path: '/Edging/edging',
+              name: 'edging',
+              component: () => import('../views/Edging/edging.vue'),
+            }
+          ]
+        },
+        {
+          /*----------- 娓呮礂鏈� ----------------*/
+          path: 'Cleaning',
+          name: 'cleaning',
+          component: () => import('../views/Cleaning/cleaning.vue'),
+          children: [
+            {
+              path: '/Cleaning/cleaning',
+              name: 'cleaning',
+              component: () => import('../views/Cleaning/cleaning.vue'),
+            }
+          ]
+        },
+        {
+          /*----------- 缈荤墖鍙� ----------------*/
+          path: 'FlipSlice',  
+          name: 'flipSlice',
+          component: () => import('../views/FlipSlice/flipSlice.vue'),
+          children: [
+            {
+              path: '/FlipSlice/flipSlice',
+              name: 'flipSlice',
+              component: () => import('../views/FlipSlice/flipSlice.vue'),
+            }
+          ]
+        },
+        {
+          /*----------- 缈荤墖鍙� ----------------*/
+          path: 'ScanQrCodesReport',  
+          name: 'scanQrCodesReport',
+          component: () => import('../views/ScanQrCodesReport/scanQrCodesReport.vue'),
+          children: [
+            {
+              path: '/ScanQrCodesReport/scanQrCodesReport',
+              name: 'scanQrCodesReport',
+              component: () => import('../views/ScanQrCodesReport/scanQrCodesReport.vue'),
+            }
+          ]
+        },
         // {
         //   /*----------- 鎵爜2 ----------------*/
         //   path: 'ScanQrCodesVerify',
@@ -101,45 +114,45 @@
         //     }
         //   ]
         // },
-        {
-          /*----------- 鑷姩鎵撴爣鏈� ----------------*/
-          path: 'Marking',
-          name: 'marking',
-          component: () => import('../views/Marking/marking.vue'),
-          children: [
-            {
-              path: '/Marking/marking',
-              name: 'marking',
-              component: () => import('../views/Marking/marking.vue'),
-            }
-          ]
-        },
-        {
-          /*----------- 鑷姩涓濆嵃鏈� ----------------*/
-          path: 'SilkScreen',
-          name: 'silkScreen',
-          component: () => import('../views/SilkScreen/silkScreen.vue'),
-          children: [
-            {
-              path: '/SilkScreen/silkScreen',
-              name: 'silkScreen',
-              component: () => import('../views/SilkScreen/silkScreen.vue'),
-            }
-          ]
-        },
-        {
-          /*----------- 鑷姩鐐硅兌鏈� ----------------*/
-          path: 'GlueDispenser',
-          name: 'glueDispenser',
-          component: () => import('../views/GlueDispenser/glueDispenser.vue'),
-          children: [
-            {
-              path: '/GlueDispenser/glueDispenser',
-              name: 'glueDispenser',
-              component: () => import('../views/GlueDispenser/glueDispenser.vue'),
-            }
-          ]
-        },
+        // {
+        //   /*----------- 鑷姩鎵撴爣鏈� ----------------*/
+        //   path: 'Marking',
+        //   name: 'marking',
+        //   component: () => import('../views/Marking/marking.vue'),
+        //   children: [
+        //     {
+        //       path: '/Marking/marking',
+        //       name: 'marking',
+        //       component: () => import('../views/Marking/marking.vue'),
+        //     }
+        //   ]
+        // },
+        // {
+        //   /*----------- 鑷姩涓濆嵃鏈� ----------------*/
+        //   path: 'SilkScreen',
+        //   name: 'silkScreen',
+        //   component: () => import('../views/SilkScreen/silkScreen.vue'),
+        //   children: [
+        //     {
+        //       path: '/SilkScreen/silkScreen',
+        //       name: 'silkScreen',
+        //       component: () => import('../views/SilkScreen/silkScreen.vue'),
+        //     }
+        //   ]
+        // },
+        // {
+        //   /*----------- 鑷姩鐐硅兌鏈� ----------------*/
+        //   path: 'GlueDispenser',
+        //   name: 'glueDispenser',
+        //   component: () => import('../views/GlueDispenser/glueDispenser.vue'),
+        //   children: [
+        //     {
+        //       path: '/GlueDispenser/glueDispenser',
+        //       name: 'glueDispenser',
+        //       component: () => import('../views/GlueDispenser/glueDispenser.vue'),
+        //     }
+        //   ]
+        // },
         // {
         //   /*----------- 鐑樺共绾� ----------------*/
         //   path: 'Drying',
@@ -179,19 +192,19 @@
         //     }
         //   ]
         // },
-        // {
-        //   /*----------- 鎶ュ伐绠＄悊 ----------------*/
-        //   path: 'ZiDongShangpian',
-        //   name: 'zidongshangpian',
-        //   component: () => import('../views/Marking/marking.vue'),
-        //   children: [
-        //     {
-        //       path: '/Marking/marking',
-        //       name: 'marking',
-        //       component: () => import('../views/Marking/marking.vue'),
-        //     }
-        //   ]
-        // },
+        {
+          /*----------- 鎶ュ伐绠＄悊 ----------------*/
+          path: 'ManualReporting',
+          name: 'manualReporting',
+          component: () => import('../views/ManualReporting/manualReporting.vue'),
+          children: [
+            {
+              path: '/ManualReporting/manualReporting',
+              name: 'manualReporting',
+              component: () => import('../views/ManualReporting/manualReporting.vue'),
+            }
+          ]
+        },
         // {
         //   /*----------- 鎶ヨ〃绠＄悊 ----------------*/
         //   path: 'ZiDongShangpian',

--
Gitblit v1.8.0