冲突 样式小改

liuyg

2021-07-15 15fcf6a04e05480a57d2c416f2589487fee34241

 src/router/views/index.js

@@ -1,208 +1,236 @@
import Layout from '@/page/index/'

export default [
  // {
  //   path: '/wel',
  //   component: Layout,
  //   redirect: '/wel/index',
  //   children: [{
  //     path: 'index',
  //     name: '首页',
  //     meta: {
  //       i18n: 'dashboard'
  //     },
  //     component: () =>
  //       import( /*webpackChunkName:"views"*/ '@/views/wel/index')
  //   }, {
  //     path: 'dashboard',
  //     name: '控制台',
  //     meta: {
  //       i18n: 'dashboard',
  //       menu: false,
  //     },
  //     component: () =>
  //       import( /*webpackChunkName:"views"*/ '@/views/wel/dashboard')
  //   }]
  // },
    // {
    //   path: '/wel',
    //   component: Layout,
    //   redirect: '/wel/index',
    //   children: [{
    //     path: 'index',
    //     name: '首页',
    //     meta: {
    //       i18n: 'dashboard'
    //     },
    //     component: () =>
    //       import( /*webpackChunkName:"views"*/ '@/views/wel/index')
    //   }, {
    //     path: 'dashboard',
    //     name: '控制台',
    //     meta: {
    //       i18n: 'dashboard',
    //       menu: false,
    //     },
    //     component: () =>
    //       import( /*webpackChunkName:"views"*/ '@/views/wel/dashboard')
    //   }]
    // },

  {
    path: '/wel',
    component: () =>
      import('@/views/home/index')
    // component: Layout,
    // redirect: '/wel/index',
    // children: [{
    //   path: 'index',
    //   name: '首页',
    //   meta: {
    //     i18n: 'dashboard'
    //   },
    //   component: () =>
    //     import( /* webpackChunkName: "views" */ '@/views/wel/index')
    // }, {
    //   path: 'dashboard',
    //   name: '控制台',
    //   meta: {
    //     i18n: 'dashboard',
    //     menu: false,
    //   },
    //   component: () =>
    //     import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
    // }]
  },
    {
        path: '/wel',
        component: () =>
            import('@/views/home/index')
        // component: Layout,
        // redirect: '/wel/index',
        // children: [{
        //   path: 'index',
        //   name: '首页',
        //   meta: {
        //     i18n: 'dashboard'
        //   },
        //   component: () =>
        //     import( /* webpackChunkName: "views" */ '@/views/wel/index')
        // }, {
        //   path: 'dashboard',
        //   name: '控制台',
        //   meta: {
        //     i18n: 'dashboard',
        //     menu: false,
        //   },
        //   component: () =>
        //     import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
        // }]
    },



  {
    path: '/test',
    component: Layout,
    redirect: '/test/index',
    children: [{
      path: 'index',
      name: '测试页',
      meta: {
        i18n: 'test'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/util/test')
    }]
  }, {
    path: '/dict-horizontal',
    component: Layout,
    redirect: '/dict-horizontal/index',
    children: [{
      path: 'index',
      name: '字典管理',
      meta: {
        i18n: 'dict'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
    }]
  }, {
    path: '/dict-vertical',
    component: Layout,
    redirect: '/dict-vertical/index',
    children: [{
      path: 'index',
      name: '字典管理',
      meta: {
        i18n: 'dict'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
    }]
  }, {
    path: '/info',
    component: Layout,
    redirect: '/info/index',
    children: [{
      path: 'index',
      name: '个人信息',
      meta: {
        i18n: 'info'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
    }]
  }, {
    path: '/work/process/leave',
    component: Layout,
    redirect: '/work/process/leave/form',
    children: [{
      path: 'form/:processDefinitionId',
      name: '请假流程',
      meta: {
        i18n: 'work'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
    {
        path: '/test',
        component: Layout,
        redirect: '/test/index',
        children: [{
            path: 'index',
            name: '测试页',
            meta: {
                i18n: 'test'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/util/test')
        }]
    }, {
      path: 'handle/:taskId/:processInstanceId/:businessId',
      name: '处理请假流程',
      meta: {
        i18n: 'work'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
        path: '/dict-horizontal',
        component: Layout,
        redirect: '/dict-horizontal/index',
        children: [{
            path: 'index',
            name: '字典管理',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
        }]
    }, {
      path: 'detail/:processInstanceId/:businessId',
      name: '请假流程详情',
      meta: {
        i18n: 'work'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
    }]
  }, {
    path: '/attach',
    redirect: '/resource/attach',
    component: Layout,
    children: [{
      path: 'index',
      name: '附件上传',
      meta: {
        i18n: 'index',
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/resource/attach')
    }]
  },
  {
    path: '/register',
    redirect: '/management/index',
    component: Layout,
    children: [{
      path: 'index',
      name: '保安人员管理',
      meta: {
        i18n: 'index',
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/management/register')
    }]
  }, {
    path: '/management',
    redirect: '/management/index',
    component: Layout,
    children: [{
      path: 'index',
      name: '保安详细资料',
      meta: {
        i18n: 'index',
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/management/peopleDetails')
    }]
  }, {
    path: '/securityCompany',
    redirect: '/securityCompany/index',
    component: Layout,
    children: [{
      path: 'index',
      name: '保安详细资料',
      meta: {
        i18n: 'index',
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/securityCompany/companyDetails')
    }]
  }, {
    path: '/map',
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/mapHome/index')
  }, {
    path: '/regulatoryInformation',
    redirect: '/regulatoryInformation/index',
    component: Layout,
    children: [{
      path: 'index',
      name: '监管信息',
      meta: {
        i18n: 'index',
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
    }]
  }
        path: '/dict-vertical',
        component: Layout,
        redirect: '/dict-vertical/index',
        children: [{
            path: 'index',
            name: '字典管理',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
        }]
    }, {
        path: '/info',
        component: Layout,
        redirect: '/info/index',
        children: [{
            path: 'index',
            name: '个人信息',
            meta: {
                i18n: 'info'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
        }]
    }, {
        path: '/work/process/leave',
        component: Layout,
        redirect: '/work/process/leave/form',
        children: [{
            path: 'form/:processDefinitionId',
            name: '请假流程',
            meta: {
                i18n: 'work'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
        }, {
            path: 'handle/:taskId/:processInstanceId/:businessId',
            name: '处理请假流程',
            meta: {
                i18n: 'work'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
        }, {
            path: 'detail/:processInstanceId/:businessId',
            name: '请假流程详情',
            meta: {
                i18n: 'work'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
        }]
    }, {
        path: '/attach',
        redirect: '/resource/attach',
        component: Layout,
        children: [{
            path: 'index',
            name: '附件上传',
            meta: {
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/resource/attach')
        }]
    },
    {
        path: '/register',
        redirect: '/management/index',
        component: Layout,
        children: [{
            path: 'index',
            name: '保安人员管理',
            meta: {
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/management/register')
        }]
    },
    {
        path: '/desk',
        component: Layout,
        redirect: '/desk/notice',
        children: [{
            path: 'index',
            name: '通知公告',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/desk/notice')
        }]
    },
    {
        path: '/resource',
        redirect: '/resource/uploadNotice',
        component: Layout,
        children: [{
            path: 'uploadNotice',
            name: '附件上传',
            meta: {
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
        }]
    }, {
        path: '/management',
        redirect: '/management/index',
        component: Layout,
        children: [{
            path: 'index',
            name: '保安详细资料',
            meta: {
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/management/peopleDetails')
        }]
    }, {
        path: '/securityCompany',
        redirect: '/securityCompany/index',
        component: Layout,
        children: [{
            path: 'index',
            name: '保安详细资料',
            meta: {
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/securityCompany/companyDetails')
        }]
    }, {
        path: '/map',
        component: () =>
            import( /* webpackChunkName: "views" */ '@/views/mapHome/index')
    }, {
        path: '/regulatoryInformation',
        redirect: '/regulatoryInformation/index',
        component: Layout,
        children: [{
            path: 'index',
            name: '监管信息',
            meta: {
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
        }]
    }
]