From 3a38edcb5e9c15a9591e1e913d3583f3d437caf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 十月 2024 10:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch '公司服务器/master'

---
 UI-Project/src/router/index.js |  129 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 123 insertions(+), 6 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index c51d269..b62dc2c 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -1,5 +1,8 @@
 import {createRouter, createWebHashHistory} from 'vue-router'
-
+// import i18n from '@/utils/lang'
+// import User from '../views/sys/User.vue'
+// import Role from '../views/sys/Role.vue'
+// import Menu from '../views/sys/Menu.vue'
 const router = createRouter({
   history: createWebHashHistory(),
   routes: [
@@ -13,6 +16,11 @@
       path: '/login',
       name: 'login',
       component: () => import('../views/LoginView.vue')
+    },
+    {
+      path: '/new-page', // 鏂板鐨勬棤闇�鐧诲綍鐨勯〉闈�  
+      name: 'newPage',  
+      component: () => import('../views/NewPage.vue')
     },
     {
       path: '/main',
@@ -64,13 +72,18 @@
         /*----------- 涓婄墖鏈� ----------------*/
       {
         path: 'Returns',
-        name: 'Returns',
-        component: () => import('../views/Returns/returns.vue'),
+        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',
+            component: () => import('../views/Returns/upreturns.vue')
           },
         ]
       },
@@ -108,13 +121,18 @@
   /*----------- 纾ㄨ竟锛堝喎鍔犲伐锛� ----------------*/
 {
   path: 'StockBasicData',
-  name: 'StockBasicData',
-  component: () => import('../views/StockBasicData/stockBasicData.vue'),
+  name: 'Select',
+  component: () => import('../views/StockBasicData/Select.vue'),
   children:[
     {
       path: '/StockBasicData/stockBasicData',
       name: 'stockBasicData',
       component: () => import('../views/StockBasicData/stockBasicData.vue')
+    },
+    {
+      path: '/StockBasicData/stockBasicDatatwo',
+      name: 'stockBasicDatatwo',
+      component: () => import('../views/StockBasicData/stockBasicDatatwo.vue')
     },
   ]
 },
@@ -177,6 +195,24 @@
             }
           ]
         },
+         /*----------- 浠撳偍涓績 ----------------*/
+         {
+          path: 'GlassStorage',
+          name: 'GlassStorage',
+          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')
+            }
+          ]
+        },
 
          /*----------- 鍙鍖栫郴缁� ----------------*/
          {
@@ -200,10 +236,82 @@
               component: () => import('../views/Visualization/screenthree.vue')
             }
           ]
+         },
+/*----------- 绯荤粺绠＄悊 ----------------*/
+{
+  path: 'User',
+  name: 'user',
+  component: () => import('../views/User/user.vue'),
+  children:[
+    {
+      path: '/User/userlist',
+      name: 'userlist',
+      component: () => import('../views/User/userlist.vue')
+    },
+    {
+      path: '/User/rolelist',
+      name: 'rolelist',
+      component: () => import('../views/User/rolelist.vue')
+    },
+    {
+      path: '/User/permissions',
+      name: 'permissions',
+      component: () => import('../views/User/permissions.vue')
+    }
+  ]
+ },
+  /*----------- 澶у睆鏄剧ず ----------------*/
+  {
+    path: 'largescreen',
+    name: 'largescreen',
+    component: () => import('../views/largescreen/largescreen.vue'),
+    children:[
+      {
+        path: '/largescreen/largescreen',
+        name: 'largescreen',
+        component: () => import('../views/largescreen/largescreen.vue')
+      },
+    ]
+  },
+  /*----------- 鎶ュ伐绠＄悊 ----------------*/
+  {
+    path: 'reportWork',
+    name: 'reportWork',
+    component: () => import('../views/ReportWork/reportWork.vue'),
+    children:[
+      {
+        path: '/ReportWork/reportWork',
+        name: 'reportWork',
+        component: () => import('../views/ReportWork/reportWork.vue')
+      },
+    ]
+  },
+        /*----------- 绠＄悊绯荤粺 ----------------*/
+        {
+          path: 'sys',
+          name: 'screen',
+          component: () => import('../views/Visualization/screen.vue'),
+          children: [
+            // {
+            //   path: '/sys/users',
+            //   name: 'SysUser',
+            //   component: User
+            // },
+            // {
+            //   path: '/sys/roles',
+            //   name: 'SysRole',
+            //   component: Role
+            // },
+            // {
+            //   path: '/sys/menus',
+            //   name: 'SysMenu',
+            //   component: Menu
+            // },
+          ]
         },
         {
           path: '',
-          redirect:'/Slicecage/slicecage'
+          redirect: '/Returns/returns'
         }
       ]
     },
@@ -216,4 +324,13 @@
   ]
 })
 
+// 瀵艰埅瀹堝崼  
+router.beforeEach((to, from, next) => {  
+  const isAuthenticated = !!localStorage.getItem('authToken'); // 鍋囪杩欐槸浣犵殑鐧诲綍鐘舵�佹鏌ラ�昏緫  
+  if (to.matched.some(record => record.meta.requiresAuth) && !isAuthenticated) {  
+    next({ name: 'login' }); // 濡傛灉闇�瑕佺櫥褰曚絾鏈櫥褰曪紝鍒欓噸瀹氬悜鍒扮櫥褰曢〉闈�  
+  } else {  
+    next(); // 鍚﹀垯缁х画瀵艰埅  
+  }  
+}); 
 export default router

--
Gitblit v1.8.0