Merge remote-tracking branch 'origin/master'

zhoushihao

2025-03-03 bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2

 UI-Project/src/router/index.js

@@ -27,8 +27,6 @@
      name: 'main',
      component: () => import('../layout/MainErpView.vue'),
      children:[
        
        
        {
          path: 'Temperedlayout',
          name: 'Temperedlayout',
@@ -41,34 +39,6 @@
            }
         ]
        },
      
/*----------- 用户列表 ----------------*/
// {
//   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',
@@ -76,27 +46,37 @@
        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')
          },
          {
            path: '/Returns/upreturns2',
            name: 'upreturns2',
            component: () => import('../views/Returns/upreturns2.vue')
          },
        ]
      },
      /*----------- 掰片/识别 ----------------*/
    {
      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')
        },
        {
          path: '/Identify/identifwutwo',
          name: 'identifwutwo',
          component: () => import('../views/Identify/identifwutwo.vue')
        },
      ]
    },
@@ -134,6 +114,11 @@
      name: 'stockBasicDatatwo',
      component: () => import('../views/StockBasicData/stockBasicDatatwo.vue')
    },
    {
      path: '/StockBasicData/stockBasicyiwu',
      name: 'stockBasicyiwu',
      component: () => import('../views/StockBasicData/stockBasicyiwu.vue')
    },
  ]
},
/*----------- 大理片笼 ----------------*/
@@ -167,34 +152,6 @@
  },
]
},
          /*----------- 下片台 ----------------*/
        {
          path: 'UnLoadGlass',
          name: 'UnLoadGlass',
          component: () => import('../views/UnLoadGlass/UnLoadGlass.vue'),
          children:[
            {
              path: '/UnLoadGlass/loadmachinerack',
              name: 'loadmachinerack',
              component: () => import('../views/UnLoadGlass/loadmachinerack.vue')
            },
            {
              path: '/UnLoadGlass/loadmachineracktwo',
              name: 'loadmachineracktwo',
              component: () => import('../views/UnLoadGlass/loadmachineracktwo.vue')
            },
            {
              path: '/UnLoadGlass/Landingindication',
              name: 'Landingindication',
              component: () => import('../views/UnLoadGlass/Landingindication.vue')
            },
            {
              path: '/UnLoadGlass/Landingindicationtwo',
              name: 'Landingindicationtwo',
              component: () => import('../views/UnLoadGlass/Landingindicationtwo.vue')
            }
          ]
        },
         /*----------- 仓储中心 ----------------*/
         {
          path: 'GlassStorage',
@@ -260,7 +217,7 @@
    }
  ]
 },
  /*----------- 大屏显示 ----------------*/
  /*----------- 显示 ----------------*/
  {
    path: 'largescreen',
    name: 'largescreen',
@@ -278,7 +235,7 @@
    path: 'reportWork',
    name: 'reportWork',
    component: () => import('../views/ReportWork/reportWork.vue'),
    children:[
    children: [
      {
        path: '/ReportWork/reportWork',
        name: 'reportWork',
@@ -286,6 +243,48 @@
      },
    ]
  },
  
  /*----------- 大屏显示 ----------------*/
  {
    path: 'largescreendisplay',
    name: 'screendisplay',
    component: () => import('../views/largescreendisplay/screendisplay.vue'),
    children: [
      {
        path: '/largescreendisplay/screendisplay',
        name: 'screendisplay',
        component: () => import('../views/largescreendisplay/screendisplay.vue')
      },
    ]
  },
        /*----------- 中空 ----------------*/
        {
          path: 'hollow',
          name: 'hol',
          component: () => import('../views/hollow/hol.vue'),
          children: [
            {
              path: '/hollow/hollowequipment',
              name: 'hollowequipment',
              component: () => import('../views/hollow/hollowequipment.vue')
            },
            {
              path: '/hollow/hollowequipmenttwo',
              name: 'hollowequipmenttwo',
              component: () => import('../views/hollow/hollowequipmenttwo.vue')
            },
            {
              path: '/hollow/hollowslicecage',
              name: 'hollowslicecage',
              component: () => import('../views/hollow/hollowslicecage.vue')
            },
            {
              path: '/hollow/hollowaluminum',
              name: 'hollowaluminum',
              component: () => import('../views/hollow/hollowaluminum.vue')
            },
          ]
        },
        /*----------- 管理系统 ----------------*/
        {
          path: 'sys',
@@ -309,10 +308,10 @@
            // },
          ]
        },
        {
          path: '',
          redirect: '/Returns/returns'
        }
        // {
        //   path: '',
        //   redirect: '/hollow/hollowslicecage'
        // }
      ]
    },
    {
@@ -320,10 +319,8 @@
      name: 'register',
      component: () => import('../views/RegisterView.vue')
    }
    
  ]
})
 
// 导航守卫  
router.beforeEach((to, from, next) => {  
  const isAuthenticated = !!localStorage.getItem('authToken'); // 假设这是你的登录状态检查逻辑