Merge remote-tracking branch 'origin/master'

wangfei

2025-05-13 0b41a5c59028a61bff22f60e74cb1d6d53a40e61

 UI-Project/src/router/index.js

@@ -54,7 +54,7 @@
            path: '/Returns/upreturns2',
            name: 'upreturns2',
            component: () => import('../views/Returns/upreturns2.vue')
          },
          }
        ]
      },
      /*----------- 掰片/识别 ----------------*/
@@ -221,6 +221,11 @@
      path: '/User/permissions',
      name: 'permissions',
      component: () => import('../views/User/permissions.vue')
    },
    {
      path: '/User/userpageNo',
      name: 'userpageNo',
      component: () => import('../views/User/userpageNo.vue')
    }
  ]
 },
@@ -281,6 +286,11 @@
              component: () => import('../views/hollow/hollowequipmenttwo.vue')
            },
            {
              path: '/hollow/hollowequipmenthree',
              name: 'hollowequipmenthree',
              component: () => import('../views/hollow/hollowequipmenthree.vue')
            },
            {
              path: '/hollow/hollowslicecage',
              name: 'hollowslicecage',
              component: () => import('../views/hollow/hollowslicecage.vue')
@@ -289,6 +299,16 @@
              path: '/hollow/hollowaluminum',
              name: 'hollowaluminum',
              component: () => import('../views/hollow/hollowaluminum.vue')
            },
            {
              path: '/hollow/hollowaluminumtwo',
              name: 'hollowaluminumtwo',
              component: () => import('../views/hollow/hollowaluminumtwo.vue')
            },
            {
              path: '/hollow/hollowaluminumthree',
              name: 'hollowaluminumthree',
              component: () => import('../views/hollow/hollowaluminumthree.vue')
            },
          ]
        },
@@ -374,6 +394,18 @@
                   },
                 ]
                },
                {
                   path: '/hellowquipthreehistory',
                    name: 'hellowquipthreehistory',
                    component: () => import('../views/hollow/hellowquipthreehistory.vue'),
                    children: [
                      {
                       path: '/hollow/hellowquipthreehistory',
                       name: 'hellowquipthreehistory',
                       component: () => import('../views/hollow/hellowquipthreehistory.vue')
                      },
                    ]
                   },
          {
             path: '/cachingbeforehistory',
              name: 'cachingbeforehistory',
@@ -458,6 +490,18 @@
                      },
                    ]
                   },
                   {
                    path: '/productionstatistics',
                     name: 'productionstatistics',
                     component: () => import('../views/largescreendisplay/productionstatistics.vue'),
                     children: [
                       {
                        path: '/largescreendisplay/productionstatistics',
                        name: 'productionstatistics',
                        component: () => import('../views/largescreendisplay/productionstatistics.vue')
                       },
                     ]
                    },
  ]
})
// 导航守卫