From 101581ee75385f7cfce3adb6cd3cb3e202aa2064 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 15 Jul 2021 22:31:36 +0800
Subject: [PATCH] 合并修改

---
 src/router/views/index.js |  511 +++++++++++++++++++++++++++----------------------------
 1 files changed, 251 insertions(+), 260 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index 01c6c60..aa2510c 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -383,264 +383,255 @@
             component: () =>
                 import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
         }]
-    }
-]
-path: 'detail/:processInstanceId/:businessId',
-    name: '请假流程详情',
-    meta: {
-        i18n: 'work'
-    },
-    component: () =>
-    import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
-}]
-}, {
-    path: '/securityAnalysis',
-    component: Layout,
-    redirect: '/securityAnalysis/index',
-    children: [{
-        path: 'index',
-        name: '保安单位情况智能分析',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
-    }]
-}, {
-    path: '/recruitmentManagement',
-    component: Layout,
-    redirect: '/recruitmentManagement/index',
-    children: [{
-        path: 'index',
-        name: '招聘管理',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
-    }]
-}, {
-    path: '/securityUnit',
-    component: Layout,
-    redirect: '/securityUnit/index',
-    children: [{
-        path: 'index',
-        name: '保安单位信息',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
-    }]
-}, {
-    path: '/securityGuard',
-    component: Layout,
-    redirect: '/securityGuard/securityGuard',
-    children: [{
-        path: 'index',
-        name: '保安员查询',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
-    }]
-}, {
-    path: '/securityGuardDetail',
-    component: Layout,
-    redirect: '/securityGuardDetail/index',
-    children: [{
-        path: 'index',
-        name: '保安员详情',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
-    }]
-}, {
-    path: '/resource',
-    component: Layout,
-    redirect: '/resource/attach',
-    children: [{
-        path: 'attach',
-        name: '附件上传',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
-    }]
-}, {
-    path: '/securityUnitChild',
-    component: Layout,
-    redirect: '/securityUnitChild/index',
-    children: [{
-        path: 'index',
-        name: '保安单位详情',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
-    }]
-}, {
-    path: '/securityGuard',
-    component: Layout,
-    redirect: '/securityGuard/securityGuard',
-    children: [{
-        path: 'index',
-        name: '保安员管理',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
-    }]
-},
-// {
-//     path: '/dispatch/dispatch',
-//     component: Layout,
-//     redirect: '/dispatch/dispatch',
-//     children: [{
-//         path: 'index',
-//         name: '派遣服务管理',
-//         meta: {
-//             i18n: 'dict'
-//         },
-//         component: () =>
-//             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
-//     }]
-// },
-{
-    path: '/desk',
-    component: Layout,
-    redirect: '/desk/notice',
-    children: [{
-        path: 'index',
-        name: '通知公告',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
-    }]
-}, {
-    path: '/dispatch',
-    component: Layout,
-    redirect: '/dispatch/dispatch',
-    children: [{
-        path: 'dispatch',
-        name: '派遣单位管理',
-        meta: {
-            i18n: 'dispatch'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
     }, {
-        path: 'dispatchChildoperable',
-        name: '派遣记录管理',
-        meta: {
-            i18n: 'dispatch'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperable')
-    }]
-}, {
-    path: '/dispatchChild',
-    component: Layout,
-    redirect: '/dispatchChild/index',
-    children: [{
-        path: 'index',
-        name: '派遣服务记录',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
-    }]
-},
-// {
-//     path: '/equipments',
-//     component: Layout,
-//     redirect: '/equipments/index',
-//     children: [{
-//         path: 'index',
-//         name: '保安公司装备管理',
-//         meta: {
-//             i18n: 'dict'
-//         },
-//         component: () =>
-//             import( /* webpackChunkName: "views" */ '@/views/equipments/index')
-//     }]
-// }, {
-//     path: '/car',
-//     component: Layout,
-//     redirect: '/car/index',
-//     children: [{
-//         path: 'index',
-//         name: '保安公司车辆管理',
-//         meta: {
-//             i18n: 'dict'
-//         },
-//         component: () =>
-//             import( /* webpackChunkName: "views" */ '@/views/car/index')
-//     }]
-// }, {
-//     path: '/gun',
-//     component: Layout,
-//     redirect: '/gun/index',
-//     children: [{
-//         path: 'index',
-//         name: '保安公司枪支管理',
-//         meta: {
-//             i18n: 'dict'
-//         },
-//         component: () =>
-//             import( /* webpackChunkName: "views" */ '@/views/gun/index')
-//     }]
-// },
-// {
-//     path: '/securityEquipment',
-//     component: Layout,
-//     redirect: '/securityEquipment',
-//     children: [{
-//         path: 'equipments',
-//         name: '装备管理',
-//         meta: {
-//             i18n: 'securityEquipment'
-//         },
-//         component: () =>
-//             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/equipments')
-//     }, {
-//         path: 'car',
-//         name: '车辆管理',
-//         meta: {
-//             i18n: 'car'
-//         },
-//         component: () =>
-//             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/car')
-//     }, {
-//         path: 'gun',
-//         name: '车辆管理',
-//         meta: {
-//             i18n: 'gun'
-//         },
-//         component: () =>
-//             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/gun')
-//     }]
-// },
-{
-    path: '/trainingRegistration',
-    component: Layout,
-    redirect: '/trainingRegistration/index',
-    children: [{
-        path: 'index',
-        name: '保安培训报名管理',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
-    }]
-}]
\ No newline at end of file
+        path: '/securityAnalysis',
+        component: Layout,
+        redirect: '/securityAnalysis/index',
+        children: [{
+            path: 'index',
+            name: '保安单位情况智能分析',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
+        }]
+    }, {
+        path: '/recruitmentManagement',
+        component: Layout,
+        redirect: '/recruitmentManagement/index',
+        children: [{
+            path: 'index',
+            name: '招聘管理',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
+        }]
+    }, {
+        path: '/securityUnit',
+        component: Layout,
+        redirect: '/securityUnit/index',
+        children: [{
+            path: 'index',
+            name: '保安单位信息',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
+        }]
+    }, {
+        path: '/securityGuard',
+        component: Layout,
+        redirect: '/securityGuard/securityGuard',
+        children: [{
+            path: 'index',
+            name: '保安员查询',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+        }]
+    }, {
+        path: '/securityGuardDetail',
+        component: Layout,
+        redirect: '/securityGuardDetail/index',
+        children: [{
+            path: 'index',
+            name: '保安员详情',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
+        }]
+    }, {
+        path: '/resource',
+        component: Layout,
+        redirect: '/resource/attach',
+        children: [{
+            path: 'attach',
+            name: '附件上传',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
+        }]
+    }, {
+        path: '/securityUnitChild',
+        component: Layout,
+        redirect: '/securityUnitChild/index',
+        children: [{
+            path: 'index',
+            name: '保安单位详情',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
+        }]
+    }, {
+        path: '/securityGuard',
+        component: Layout,
+        redirect: '/securityGuard/securityGuard',
+        children: [{
+            path: 'index',
+            name: '保安员管理',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+        }]
+    },
+    // {
+    //     path: '/dispatch/dispatch',
+    //     component: Layout,
+    //     redirect: '/dispatch/dispatch',
+    //     children: [{
+    //         path: 'index',
+    //         name: '派遣服务管理',
+    //         meta: {
+    //             i18n: 'dict'
+    //         },
+    //         component: () =>
+    //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
+    //     }]
+    // },
+    {
+        path: '/desk',
+        component: Layout,
+        redirect: '/desk/notice',
+        children: [{
+            path: 'index',
+            name: '通知公告',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
+        }]
+    }, {
+        path: '/dispatch',
+        component: Layout,
+        redirect: '/dispatch/dispatch',
+        children: [{
+            path: 'dispatch',
+            name: '派遣单位管理',
+            meta: {
+                i18n: 'dispatch'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
+        }, {
+            path: 'dispatchChildoperable',
+            name: '派遣记录管理',
+            meta: {
+                i18n: 'dispatch'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperable')
+        }]
+    }, {
+        path: '/dispatchChild',
+        component: Layout,
+        redirect: '/dispatchChild/index',
+        children: [{
+            path: 'index',
+            name: '派遣服务记录',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
+        }]
+    },
+    // {
+    //     path: '/equipments',
+    //     component: Layout,
+    //     redirect: '/equipments/index',
+    //     children: [{
+    //         path: 'index',
+    //         name: '保安公司装备管理',
+    //         meta: {
+    //             i18n: 'dict'
+    //         },
+    //         component: () =>
+    //             import( /* webpackChunkName: "views" */ '@/views/equipments/index')
+    //     }]
+    // }, {
+    //     path: '/car',
+    //     component: Layout,
+    //     redirect: '/car/index',
+    //     children: [{
+    //         path: 'index',
+    //         name: '保安公司车辆管理',
+    //         meta: {
+    //             i18n: 'dict'
+    //         },
+    //         component: () =>
+    //             import( /* webpackChunkName: "views" */ '@/views/car/index')
+    //     }]
+    // }, {
+    //     path: '/gun',
+    //     component: Layout,
+    //     redirect: '/gun/index',
+    //     children: [{
+    //         path: 'index',
+    //         name: '保安公司枪支管理',
+    //         meta: {
+    //             i18n: 'dict'
+    //         },
+    //         component: () =>
+    //             import( /* webpackChunkName: "views" */ '@/views/gun/index')
+    //     }]
+    // },
+    // {
+    //     path: '/securityEquipment',
+    //     component: Layout,
+    //     redirect: '/securityEquipment',
+    //     children: [{
+    //         path: 'equipments',
+    //         name: '装备管理',
+    //         meta: {
+    //             i18n: 'securityEquipment'
+    //         },
+    //         component: () =>
+    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/equipments')
+    //     }, {
+    //         path: 'car',
+    //         name: '车辆管理',
+    //         meta: {
+    //             i18n: 'car'
+    //         },
+    //         component: () =>
+    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/car')
+    //     }, {
+    //         path: 'gun',
+    //         name: '车辆管理',
+    //         meta: {
+    //             i18n: 'gun'
+    //         },
+    //         component: () =>
+    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/gun')
+    //     }]
+    // },
+    {
+        path: '/trainingRegistration',
+        component: Layout,
+        redirect: '/trainingRegistration/index',
+        children: [{
+            path: 'index',
+            name: '保安培训报名管理',
+            meta: {
+                i18n: 'dict'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
+        }]
+    }
+]
\ No newline at end of file

--
Gitblit v1.9.3