Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-04-22 2027077e00eff0b9fa6b0f68f803a9780f065e21

 UI-Project/src/router/index.js

@@ -22,46 +22,46 @@
      children:[
        
        
        // {
        //   path: 'Temperedlayout',
        //   name: 'Temperedlayout',
        //   component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
        //   children:[
        //     {
        //      path: 'selectLayout',
        //       name: 'selectLayout',
        //       component: () => import('../views/TL/Temperedlayout/SelectLayout.vue'),
        //     }
        //  ]
        // },
        {
          path: 'Temperedlayout',
          name: 'Temperedlayout',
          component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
          children:[
            {
             path: 'selectLayout',
              name: 'selectLayout',
              component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
            }
         ]
        },
      
/*----------- 用户列表 ----------------*/
{
  path: 'User',
  name: 'User',
  component: () => import('../views/User/userlist.vue'),
  children:[
    {
      path: '/User/userlist',
      name: 'userlist',
      component: () => import('../views/User/userlist.vue')
    },
  ]
  },
// {
//   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: 'Permissions',
//   name: 'Permissions',
//   component: () => import('../views/Permissions/permissionslist.vue'),
//   children:[
//     {
//       path: '/Permissions/permissionslist',
//       name: 'permissionslist',
//       component: () => import('../views/Permissions/permissionslist.vue')
//     },
//   ]
//   },
        /*----------- 上片机 ----------------*/
      {
        path: 'Returns',