Merge remote-tracking branch 'origin/master'

lyh

2025-05-28 e14ed882d12df3b48e59390eba364442cdff70bd

 src/config/router.config.js

@@ -1,4 +1,4 @@
import { UserLayout, TabLayout, RouteView, BlankLayout, PageView } from '@/components/layouts'
import { UserLayout, TabLayout, RouteView, BlankLayout, PageView, TerminalLayout } from '@/components/layouts'

/**
 * 走菜单，走权限控制
@@ -49,7 +49,7 @@
        path: 'alteration',
        name: 'alteration',
        component: () => import(/* webpackChunkName: "user" */ '@/views/user/alteration/Alteration')
      },
      }
    ]
  },
  {
@@ -63,7 +63,7 @@
        path: 'login',
        name: 'oauth2-app-login',
        component: () => import(/* webpackChunkName: "oauth2-app.login" */ '@/views/user/oauth2/OAuth2Login')
      },
      }
    ]
  },

@@ -84,8 +84,45 @@
    component: () => import('@/views/mdc/base/MdcWorkshopSignage.vue')
  },
  {
    path: '/terminal',
    redirect: '/terminal/login',
    component: TerminalLayout,
    children: [
      {
        path: 'login',
        name: 'operatorLogin',
        component: () => import('@/views/dnc/base/OperatorLogin.vue')
      },
      {
        path: 'index',
        name: 'terminalIndex',
        component: () => import('@/views/dnc/base/TerminalIndex.vue')
      },
      {
        path: 'work',
        name: 'equipmentStartWork',
        component: () => import('@/views/dnc/base/modules/TerminalIndex/EquipmentStartWork.vue')
      },
      {
        path: 'fault',
        name: 'reportEquipmentFault',
        component: () => import('@/views/dnc/base/modules/TerminalIndex/ReportEquipmentFault.vue')
      },
      {
        path: 'close',
        name: 'reportEquipmentClose',
        component: () => import('@/views/dnc/base/modules/TerminalIndex/ReportEquipmentClose.vue')
      },
      {
        path: 'spotCheck',
        name: 'equipmentSpotCheck',
        component: () => import('@/views/dnc/base/modules/TerminalIndex/EquipmentSpotCheck.vue')
      }
    ]
  },
  {
    path: '/404',
    component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
  },
  }

]