Merge remote-tracking branch 'origin/master'

ZengTao

5 天以前 b8a043314eb644f45e3e110c75c29b19218c2ae8

 UI-Project/src/router/index.js

@@ -254,14 +254,19 @@
  /*----------- 报工管理 ----------------*/
  {
    path: 'reportWork',
    name: 'reportWork',
    component: () => import('../views/ReportWork/reportWork.vue'),
    name: 'report',
    component: () => import('../views/ReportWork/report.vue'),
    children: [
      {
        path: '/ReportWork/reportWork',
        name: 'reportWork',
        component: () => import('../views/ReportWork/reportWork.vue')
      },
      {
        path: '/ReportWork/cardProgress',
        name: 'cardProgress',
        component: () => import('../views/ReportWork/cardProgress.vue')
      },
    ]
  },