From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/router/index.js |   69 ++++++++++++++--------------------
 1 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 1b60f11..d750e60 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -27,8 +27,6 @@
       name: 'main',
       component: () => import('../layout/MainErpView.vue'),
       children:[
-        
-        
         {
           path: 'Temperedlayout',
           name: 'Temperedlayout',
@@ -41,45 +39,12 @@
             }
          ]
         },
-      
-/*----------- 鐢ㄦ埛鍒楄〃 ----------------*/
-// {
-//   path: 'User',
-//   name: 'User',
-//   component: () => import('../views/User/userlist.vue'),
-//   children:[
-//     {
-//       path: '/User/userlist',
-//       name: 'userlist',
-//       component: () => import('../views/User/userlist.vue')
-//     },
-//   ]
-//   },
-  
-/*----------- 鏉冮檺鍒楄〃 ----------------*/
-// {
-//   path: 'Permissions',
-//   name: 'Permissions',
-//   component: () => import('../views/Permissions/permissionslist.vue'),
-//   children:[
-//     {
-//       path: '/Permissions/permissionslist',
-//       name: 'permissionslist',
-//       component: () => import('../views/Permissions/permissionslist.vue')
-//     },
-//   ]
-//   },
         /*----------- 涓婄墖鏈� ----------------*/
       {
         path: 'Returns',
         name: 'return',
         component: () => import('../views/Returns/return.vue'),
         children:[
-          {
-            path: '/Returns/returns',
-            name: 'returns',
-            component: () => import('../views/Returns/returns.vue')
-          },
           {
             path: '/Returns/upreturns',
             name: 'upreturns',
@@ -95,13 +60,18 @@
       /*----------- 鎺扮墖/璇嗗埆 ----------------*/
     {
       path: 'Identify',
-      name: 'Identify',
-      component: () => import('../views/Identify/identify.vue'),
-      children:[
+      name: 'ident',
+      component: () => import('../views/Identify/ident.vue'),
+      children: [
         {
           path: '/Identify/identify',
           name: 'identify',
           component: () => import('../views/Identify/identify.vue')
+        },
+        {
+          path: '/Identify/identifwu',
+          name: 'identifwu',
+          component: () => import('../views/Identify/identifwu.vue')
         },
       ]
     },
@@ -138,6 +108,11 @@
       path: '/StockBasicData/stockBasicDatatwo',
       name: 'stockBasicDatatwo',
       component: () => import('../views/StockBasicData/stockBasicDatatwo.vue')
+    },
+    {
+      path: '/StockBasicData/stockBasicyiwu',
+      name: 'stockBasicyiwu',
+      component: () => import('../views/StockBasicData/stockBasicyiwu.vue')
     },
   ]
 },
@@ -283,7 +258,7 @@
     path: 'reportWork',
     name: 'reportWork',
     component: () => import('../views/ReportWork/reportWork.vue'),
-    children:[
+    children: [
       {
         path: '/ReportWork/reportWork',
         name: 'reportWork',
@@ -291,6 +266,20 @@
       },
     ]
   },
+
+        /*----------- 涓┖ ----------------*/
+        {
+          path: 'hollow',
+          name: 'hollowequipment',
+          component: () => import('../views/hollow/hollowequipment.vue'),
+          children: [
+            {
+              path: '/hollow/hollowequipment',
+              name: 'hollowequipment',
+              component: () => import('../views/hollow/hollowequipment.vue')
+            },
+          ]
+        },
         /*----------- 绠＄悊绯荤粺 ----------------*/
         {
           path: 'sys',
@@ -325,10 +314,8 @@
       name: 'register',
       component: () => import('../views/RegisterView.vue')
     }
-    
   ]
 })
- 
 // 瀵艰埅瀹堝崼  
 router.beforeEach((to, from, next) => {  
   const isAuthenticated = !!localStorage.getItem('authToken'); // 鍋囪杩欐槸浣犵殑鐧诲綍鐘舵�佹鏌ラ�昏緫  

--
Gitblit v1.8.0