From aedad51e0775acd4e46f18ca8aaf27fc9ae221cf Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 22:32:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/router/views/index.js | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/src/router/views/index.js b/src/router/views/index.js
index dcf16c5..26fc96d 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -11,7 +11,7 @@
i18n: 'dashboard'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/wel/index')
+ import( /* webpackChunkName: "views" */ '@/views/wel/index')
}, {
path: 'dashboard',
name: '控制台',
@@ -20,7 +20,7 @@
menu: false,
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
+ import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
}]
}, {
path: '/test',
@@ -33,7 +33,7 @@
i18n: 'test'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/util/test')
+ import( /* webpackChunkName: "views" */ '@/views/util/test')
}]
}, {
path: '/dict-horizontal',
@@ -46,7 +46,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+ import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
}]
}, {
path: '/dict-vertical',
@@ -59,7 +59,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+ import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
}]
}, {
path: '/info',
@@ -72,7 +72,7 @@
i18n: 'info'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+ import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
}]
}, {
path: '/work/process/leave',
@@ -85,7 +85,7 @@
i18n: 'work'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+ import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
}, {
path: 'handle/:taskId/:processInstanceId/:businessId',
name: '处理请假流程',
@@ -93,7 +93,7 @@
i18n: 'work'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+ import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
}, {
path: 'detail/:processInstanceId/:businessId',
name: '请假流程详情',
@@ -101,7 +101,7 @@
i18n: 'work'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+ import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
}, {
path: '/securityAnalysis',
@@ -114,7 +114,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
+ import( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
}]
}, {
path: '/recruitmentManagement',
@@ -127,7 +127,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
+ import( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
}]
}, {
path: '/securityUnit',
@@ -140,7 +140,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
+ import( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
}]
}, {
path: '/securityGuard',
@@ -153,7 +153,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+ import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
}]
}, {
path: '/securityGuardDetail',
@@ -166,7 +166,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
+ import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
}]
}, {
path: '/resource',
@@ -179,7 +179,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
+ import( /* webpackChunkName: "views" */ '@/views/resource/attach')
}]
}, {
path: '/securityUnitChild',
@@ -192,7 +192,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
+ import( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
}]
}, {
path: '/securityGuard',
@@ -205,9 +205,24 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+ 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',
@@ -218,22 +233,31 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
+ import( /* webpackChunkName: "views" */ '@/views/desk/notice')
}]
}, {
path: '/dispatch',
component: Layout,
- redirect: '/dispatch/index',
+ redirect: '/dispatch/dispatch',
children: [{
- path: 'index',
- name: '派遣服务管理',
+ path: 'dispatch',
+ name: '派遣单位管理',
meta: {
- i18n: 'dict'
+ i18n: 'dispatch'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/dispatch/index')
+ 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',
@@ -244,7 +268,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
+ import( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
}]
}, {
path: '/equipments',
@@ -257,7 +281,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/equipments/index')
+ import( /* webpackChunkName: "views" */ '@/views/equipments/index')
}]
}, {
path: '/car',
@@ -270,7 +294,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/car/index')
+ import( /* webpackChunkName: "views" */ '@/views/car/index')
}]
}, {
path: '/gun',
@@ -283,7 +307,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/gun/index')
+ import( /* webpackChunkName: "views" */ '@/views/gun/index')
}]
}, {
path: '/trainingRegistration',
@@ -296,6 +320,6 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
+ import( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
}]
}]
\ No newline at end of file
--
Gitblit v1.9.3