From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/router/index.js |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 030de26..f492054 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -186,19 +186,24 @@
             }
           ]
         },
-
-        {
+         /*----------- 浠撳偍涓績 ----------------*/
+         {
           path: 'GlassStorage',
           name: 'GlassStorage',
-          component: () => import('../views/GlassStorage/MaterialRackManagement.vue'),
+          component: () => import('../views/GlassStorage/GlassStorage.vue'),
           children:[
             {
               path: '/GlassStorage/MaterialRackManagement',
               name: 'MaterialRackManagement',
               component: () => import('../views/GlassStorage/MaterialRackManagement.vue')
+            },
+            {
+              path: '/GlassStorage/rawfilmstorage',
+              name: 'rawfilmstorage',
+              component: () => import('../views/GlassStorage/rawfilmstorage.vue')
             }
           ]
-         },
+        },
 
          /*----------- 鍙鍖栫郴缁� ----------------*/
          {
@@ -259,6 +264,19 @@
       },
     ]
   },
+  /*----------- 鎶ュ伐绠$悊 ----------------*/
+  {
+    path: 'reportWork',
+    name: 'reportWork',
+    component: () => import('../views/ReportWork/reportWork.vue'),
+    children:[
+      {
+        path: '/ReportWork/reportWork',
+        name: 'reportWork',
+        component: () => import('../views/ReportWork/reportWork.vue')
+      },
+    ]
+  },
         /*----------- 绠$悊绯荤粺 ----------------*/
         {
           path: 'sys',

--
Gitblit v1.8.0