From f78a56ba2e2c3cf48a0809a824e306a578cefd00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 14 Jul 2021 14:23:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/router/views/index.js |  179 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 106 insertions(+), 73 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index 26fc96d..1e1e013 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -235,81 +235,114 @@
         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: '/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: '/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: '/trainingRegistration',
     component: Layout,
     redirect: '/trainingRegistration/index',

--
Gitblit v1.9.3