页面调整

src/projects/business/router/houseKeeper.js

@@ -4,44 +4,66 @@ const routesHouseKeeper = [
 		path: '/houseKeeper',
 		component: () => import('../views/Layout.vue'),
 		children: [
-			//物业
+			//监管端
 			{
-				path: 'property',
+				path: 'control',
 				component: () => import('../views/Layout.vue'),
 				children: [
-					//物业主页
+					//主页
 					{
 						path: '',
-						name: 'HouseKeeperProperty',
-						component: () => import('../views/HouseKeeper/Property/Home.vue'),
+						name: 'HouseKeeperControl',
+						component: () => import('../views/HouseKeeper/Control/Home.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],
-							title: '物业主页',
+							title: '物业及门卫主页',
 						}
 					},
 					//个人中心
 					{
 						path: 'center',
-						name: 'HouseKeeperPropertyCenter',
-						component: () => import('../views/HouseKeeper/Property/Center.vue'),
+						name: 'HouseKeeperControlCenter',
+						component: () => import('../views/HouseKeeper/Control/Center.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],
 							title: '个人中心',
 						}
 					},
+					//消息
+					{
+						path: 'message',
+						name: 'HouseKeeperControlMessage',
+						component: () => import('../views/HouseKeeper/Control/Message.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '消息',
+						}
+					},
 					//发送通知
 					{
 						path: 'sendNotice',
-						name: 'HouseKeeperPropertySendNotice',
-						component: () => import('../views/HouseKeeper/Property/SendNotice.vue'),
+						name: 'HouseKeeperControlSendNotice',
+						component: () => import('../views/HouseKeeper/Control/SendNotice.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],
 							title: '发送通知',
 						}
 					},
+					//单位列表
+					{
+						path: 'companyList',
+						name: 'HouseKeeperControlCompanyList',
+						component: () => import('../views/HouseKeeper/Control/CompanyList.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '单位列表',
+						}
+					},
 					//健康
 					{
 						path: 'health',
@@ -50,125 +72,271 @@ const routesHouseKeeper = [
 							//健康公示墙
 							{
 								path: 'wall',
-								name: 'HouseKeeperPropertyHealthWall',
-								component: () => import('../views/HouseKeeper/Property/Health/Wall.vue'),
+								name: 'HouseKeeperControlHealthWall',
+								component: () => import('../views/HouseKeeper/Control/Health/Wall.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
 									title: '健康公示',
 								}
 							},
-							//访客记录
+							//异常统计
 							{
-								path: 'guest',
-								name: 'HouseKeeperPropertyHealthGuest',
-								component: () => import('../views/HouseKeeper/Property/Health/Guest.vue'),
+								path: 'abnormalStatistics',
+								name: 'HouseKeeperControlHealthAbnormalStatistics',
+								component: () => import('../views/HouseKeeper/Control/Health/AbnormalStatistics.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '访客记录',
+									title: '异常统计',
 								}
 							},
-							//测温记录
+							//职工台账
 							{
-								path: 'temperatureRecord',
-								name: 'HouseKeeperPropertyHealthTemperatureRecord',
-								component: () => import('../views/HouseKeeper/Property/Health/TemperatureRecord.vue'),
+								path: 'worker',
+								name: 'HouseKeeperControlHealthWorker',
+								component: () => import('../views/HouseKeeper/Control/Health/Worker.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '测温记录',
+									title: '职工台账',
 								}
 							},
-							//异常记录
+							//职工台账详情
 							{
-								path: 'abnormalRecord',
-								name: 'HouseKeeperPropertyHealthAbnormalRecord',
-								component: () => import('../views/HouseKeeper/Property/Health/AbnormalRecord.vue'),
+								path: 'workerInfo',
+								name: 'HouseKeeperControlHealthWorkerInfo',
+								component: () => import('../views/HouseKeeper/Control/Health/WorkerInfo.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '异常记录',
+									title: '职工台账详情',
 								}
 							},
-							//未测人员
+							//职工测温
 							{
-								path: 'noTemperatureRecord',
-								name: 'HouseKeeperPropertyHealthNoTemperatureRecord',
-								component: () => import('../views/HouseKeeper/Property/Health/NoTemperatureRecord.vue'),
+								path: 'workerTemperature',
+								name: 'HouseKeeperControlHealthWorkerTemperature',
+								component: () => import('../views/HouseKeeper/Control/Health/WorkerTemperature.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '未测人员',
+									title: '职工测温',
 								}
 							},
-							//异常统计
+							//访客测温
 							{
-								path: 'abnormalStatistics',
-								name: 'HouseKeeperPropertyHealthAbnormalStatistics',
-								component: () => import('../views/HouseKeeper/Property/Health/AbnormalStatistics.vue'),
+								path: 'guestTemperature',
+								name: 'HouseKeeperControlHealthGuestTemperature',
+								component: () => import('../views/HouseKeeper/Control/Health/GuestTemperature.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '异常统计',
+									title: '访客测温',
+								}
+							},
+						]
+					},
+
+					//访客
+					{
+						path: 'guest',
+						component: () => import('../views/Layout.vue'),
+						children: [
+							//访客记录
+							{
+								path: '',
+								name: 'HouseKeeperControlGuest',
+								component: () => import('../views/HouseKeeper/Control/Guest/List.vue'),
+								meta: {
+									requireAuth: false,
+									role: [],
+									title: '访客记录',
+								}
+							},
+							//访客记录详情
+							{
+								path: 'Info',
+								name: 'HouseKeeperControlGuestInfo',
+								component: () => import('../views/HouseKeeper/Control/Guest/Info.vue'),
+								meta: {
+									requireAuth: false,
+									role: [],
+									title: '访客记录详情',
 								}
 							},
+						]
+					},
+
+
+				]
+			},
+			//管理端
+			{
+				path: 'admin',
+				component: () => import('../views/Layout.vue'),
+				children: [
+					//管理端主页
+					{
+						path: '',
+						name: 'HouseKeeperAdmin',
+						component: () => import('../views/HouseKeeper/Admin/Home.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '管理端主页',
+						}
+					},
+					//个人中心
+					{
+						path: 'center',
+						name: 'HouseKeeperAdminCenter',
+						component: () => import('../views/HouseKeeper/Admin/Center.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '个人中心',
+						}
+					},
+					//消息
+					{
+						path: 'message',
+						name: 'HouseKeeperAdminMessage',
+						component: () => import('../views/HouseKeeper/Admin/Message.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '消息',
+						}
+					},
+					//考勤审批
+					{
+						path: 'attendance',
+						name: 'HouseKeeperAdminAttendance',
+						component: () => import('../views/HouseKeeper/Admin/Attendance.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '考勤审批',
+						}
+					},
+					//添加人员
+					{
+						path: 'addPerson',
+						name: 'HouseKeeperAdminAddPerson',
+						component: () => import('../views/HouseKeeper/Admin/AddPerson.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '添加人员',
+						}
+					},
+					//添加人员选择设备
+					{
+						path: 'addPersonDevice',
+						name: 'HouseKeeperAdminAddPersonDevice',
+						component: () => import('../views/HouseKeeper/Admin/AddPersonDevice.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '添加人员选择设备',
+						}
+					},
+					//健康
+					{
+						path: 'health',
+						component: () => import('../views/Layout.vue'),
+						children: [
 							//健康档案
 							{
-								path: 'abnormalStatistics',
-								name: 'HouseKeeperPropertyHealthAbnormalStatistics',
-								component: () => import('../views/HouseKeeper/Property/Health/AbnormalStatistics.vue'),
+								path: 'archives',
+								name: 'HouseKeeperAdminlHealthArchives',
+								component: () => import('../views/HouseKeeper/Admin/Health/Archives.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '异常统计',
+									title: '健康档案',
 								}
 							},
-							//职工台账
+							//测温记录
 							{
-								path: 'worker',
-								name: 'HouseKeeperPropertyHealthWorker',
-								component: () => import('../views/HouseKeeper/Property/Health/Worker.vue'),
+								path: 'temperatureRecord',
+								name: 'HouseKeeperAdminHealthTemperatureRecord',
+								component: () => import('../views/HouseKeeper/Admin/Health/TemperatureRecord.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '职工台账',
+									title: '测温记录',
 								}
 							},
-							//职工台账详情
+							//异常记录
 							{
-								path: 'workerInfo',
-								name: 'HouseKeeperPropertyHealthWorkerInfo',
-								component: () => import('../views/HouseKeeper/Property/Health/WorkerInfo.vue'),
+								path: 'abnormalRecord',
+								name: 'HouseKeeperAdminHealthAbnormalRecord',
+								component: () => import('../views/HouseKeeper/Admin/Health/AbnormalRecord.vue'),
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '职工台账详情',
+									title: '异常记录',
 								}
 							},
-						]
-					},
-
+							//未测人员
+							{
+								path: 'noTemperatureRecord',
+								name: 'HouseKeeperAdminHealthNoTemperatureRecord',
+								component: () => import('../views/HouseKeeper/Admin/Health/NoTemperatureRecord.vue'),
+								meta: {
+									requireAuth: false,
+									role: [],
+									title: '未测人员',
+								}
+							},
+						],
+					}
 				]
 			},
-			//门卫
+
+			//门卫物业
 			{
-				path: 'guard',
+				path: 'property',
 				component: () => import('../views/Layout.vue'),
 				children: [
-					//门卫主页
+					//门卫物业主页
 					{
 						path: '',
-						name: 'HouseKeeperGuard',
-						component: () => import('../views/HouseKeeper/Guard/Home.vue'),
+						name: 'HouseKeeperProperty',
+						component: () => import('../views/HouseKeeper/Property/Home.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],
-							title: '门卫主页',
+							title: '门卫物业主页',
 						}
 					},
-				]
+					//个人中心
+					{
+						path: 'center',
+						name: 'HouseKeeperPropertyCenter',
+						component: () => import('../views/HouseKeeper/Property/Center.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '个人中心',
+						}
+					},
+					//消息
+					{
+						path: 'message',
+						name: 'HouseKeeperPropertyMessage',
+						component: () => import('../views/HouseKeeper/Property/Message.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '消息',
+						}
+					},
+				],
 			},
+
 		],
 	},
 ]

src/projects/business/router/master.js

@@ -310,6 +310,72 @@ const routesMaster = [
 							title: '异地打卡',
 						}
 					},
+					//考勤记录
+					{
+						path: 'list',
+						name: 'MasterAttendanceList',
+						component: () => import('../views/Master/Attendance/List.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '考勤记录',
+						}
+					},
+					//考勤详情
+					{
+						path: 'info',
+						name: 'MasterAttendanceInfo',
+						component: () => import('../views/Master/Attendance/Info.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '考勤详情',
+						}
+					},
+					//考勤补卡申请
+					{
+						path: 'apply',
+						name: 'MasterAttendanceApply',
+						component: () => import('../views/Master/Attendance/Apply.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '考勤补卡申请',
+						}
+					},
+					//请假记录
+					{
+						path: 'leaveList',
+						name: 'MasterAttendanceLeaveList',
+						component: () => import('../views/Master/Attendance/LeaveList.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '请假记录',
+						}
+					},
+					//请假详情
+					{
+						path: 'leaveInfo',
+						name: 'MasterAttendanceLeaveInfo',
+						component: () => import('../views/Master/Attendance/LeaveInfo.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '请假详情',
+						}
+					},
+					//请假提交
+					{
+						path: 'leaveForm',
+						name: 'MasterAttendanceLeaveForm',
+						component: () => import('../views/Master/Attendance/LeaveForm.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '请假提交',
+						}
+					},
 				]
 			},
 

src/projects/business/views/HouseKeeper/Control/CompanyList.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Guest/Info.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Guest/List.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Health/AbnormalStatistics.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Health/GuestTemperature.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Health/Wall.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Health/Worker.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Health/WorkerInfo.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Health/WorkerTemperature.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Home.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/Message.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Control/SendNotice.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/HouseKeeper/Property/Message.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Attendance/Apply.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Attendance/Info.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Attendance/LeaveForm.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Attendance/LeaveInfo.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Attendance/LeaveList.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Attendance/List.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>