Merge branch 'master' into dev-threejs

ZhangXianQiang

2024-04-11 6817c96db53ac16f5d5eca72b73230d898f32126

 src/router/index.js

@@ -60,6 +60,19 @@
    ]
  },
  {
    path: '/car/equipment',
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'index',
        name: 'equipment',
        component: () => import('@/views/system/equipment/index'),
        meta: { title: '资产管理', activeMenu: '/system/equipment' }
      }
    ]
  },
  {
    path: '/check-result/contract',
    component: Layout,
    hidden: true,
@@ -67,7 +80,7 @@
      {
        path: 'detail',
        name: 'check-result-contract',
        component: () => import('@/views/system/check-result/contract/detail'),
        component: () => import('@/views/system/result/default/detail'),
        meta: { title: '合同结果详情', activeMenu: '/system/check-result/contract' }
      }
    ]
@@ -77,12 +90,7 @@
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'detail',
        name: 'check-result-city',
        component: () => import('@/views/system/check-result/city/detail'),
        meta: { title: '市局考核结果详情', activeMenu: '/system/check-result/city' }
      }

    ]
  },
  {
@@ -90,12 +98,7 @@
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'detail',
        name: 'check-result-province',
        component: () => import('@/views/system/check-result/province/detail'),
        meta: { title: '省厅考核结果详情', activeMenu: '/system/check-result/province' }
      }

    ]
  },
  {