结构调整

src/projects/business/apis/Common/cert.js

@@ -1,29 +0,0 @@
-import request from '@/utils/request'
-import Qs from 'qs';
-
-/**
- * 健康证
- * @param params
- */
-
-//获取统计图表数据
-export function temperaturePersonCurve(params) {
-    return request({
-        url:  '/mobile/IndividualLogApi/temperaturePersonCurve',
-        data: Qs.stringify(params),
-        method: 'post',
-    })
-}
-
-//获取信息记录
-export function temperaturePersonDetail(params) {
-    return request({
-        url: '/mobile/IndividualLogApi/temperaturePersonDetail',
-        data: Qs.stringify(params),
-        method: 'post',
-    })
-}
-
-
-
-

src/projects/business/apis/Common/device.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//设备列表
+export function listOfDevice(params) {
+	return request({
+		url: '/devOps/listOfDevice',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/apis/Common/health.js

@@ -46,4 +46,4 @@ export function getGreenCode(personId) {
 		}),
 		method: 'post',
 	})
-}
+}

src/projects/business/apis/Common/notice.js

@@ -18,3 +18,12 @@ export function getNoticeInfo(params) {
 		method: 'post',
 	})
 }
+
+//发送通知
+export function sendMessage(params) {
+	return request({
+		url: '/mobile/messageNoticeApi/add',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/apis/HouseKeeper/admin.js

@@ -1,94 +0,0 @@
-import request from '@/utils/request'
-import Qs from 'qs';
-
-//获取设备列表
-export function getDeviceList() {
-	return request({
-		url: '/mobile/personDeviceLogApi/getDeviceList',
-		data: Qs.stringify({}),
-		method: 'post',
-	})
-}
-
-//增加人员
-export function addPerson(params) {
-	return request({
-		url: '/mobile/personInfoApi/add',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//获取测温记录
-export function getTemperatureList(params) {
-	return request({
-		url: '/mobile/personDeviceLogApi/queryTemperatureRecordListByEnt',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//获取未测人员列表
-export function queryUnmeasureGroupList(params) {
-	return request({
-		url: '/mobile/PersonDeviceFilterLog/queryUnmeasureGroupList',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//获取管理员的公司列表
-export function getCompanyList(params) {
-	return request({
-		url: '/mobile/personDeviceLogApi/queryCompanyList',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//切换当前管理的单位
-export function switchCompany(params) {
-	return request({
-		url: '/mobile/personInfoApi/switchCompany',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//获取考勤统计时段列表
-export function getAttednanceTimeList(params) {
-	return request({
-		url: '/mobile/workAttendance/findAttendancePeriod',
-		params: params,
-		method: 'get',
-	})
-}
-
-//获取考勤列表数据
-export function getAttednance(params) {
-	return request({
-		url: '/mobile/workAttendance/workAttendanceStat',
-		params: params,
-		method: 'get',
-	})
-}
-
-//获取健康档案统计
-export function getHealthyCodeStat(companyId) {
-	return request({
-		url: '/mobile/healthShowApi/healthyCodeStat',
-		params: {
-			companyId: companyId
-		},
-		method: 'get',
-	})
-}
-
-//获取健康档案列表
-export function getHealthyPersonList(params) {
-	return request({
-		url: '/mobile/IndividualLogApi/healthyPersonList',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}

src/projects/business/apis/HouseKeeper/control.js

@@ -1,29 +0,0 @@
-import request from '@/utils/request'
-import Qs from 'qs';
-
-//发送通知
-export function sendMessage(params) {
-	return request({
-		url: '/mobile/messageNoticeApi/add',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//单位列表
-export function queryCompanyList(params) {
-	return request({
-		url: '/mobile/personDeviceLogApi/queryCompanyList',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//设备列表
-export function listOfDevice(params) {
-	return request({
-		url: '/devOps/listOfDevice',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}

src/projects/business/apis/HouseKeeper/control/guest.js

@@ -1,12 +0,0 @@
-import request from '@/utils/request'
-import Qs from 'qs';
-
-//
-export function healthShowNumData(params) {
-    return request({
-        url: '/mobile/healthShowApi/numData',
-        data: Qs.stringify(params),
-        method: 'post',
-    })
-}
-

src/projects/business/apis/HouseKeeper/control/health.js

@@ -1,100 +0,0 @@
-import request from '@/utils/request'
-import Qs from 'qs';
-
-//
-export function healthShowNumData(params) {
-    return request({
-        url: '/mobile/healthShowApi/numData',
-        data: Qs.stringify(params),
-        method: 'post',
-    })
-}
-//
-export function healthShowPicData(params) {
-    return request({
-        url: '/mobile/healthShowApi/picData',
-        data: Qs.stringify(params),
-        method: 'post',
-    })
-}
-
-//获取异常统计
-export function getAbnormalStatistics(params) {
-    return request({
-        url: '/mobile/personDeviceLogApi/unusualStatistics',
-        data: Qs.stringify(params),
-        method: 'post',
-    })
-}
-//获取未检测人员列表
-export function getUndetectedPersonList(params) {
-    return request({
-        url: '/mobile/personDeviceLogApi/undetectedPersonList',
-        data: Qs.stringify(params),
-        method: 'post',
-    })
-}
-//获取绿码统计数据,popedom默认1查用户  3查职工
-export function getHealthyCodeStat(companyId, popedom) {
-    return request({
-        url: '/mobile/healthShowApi/healthyCodeStat',
-        params: {
-            companyId: companyId,
-            popedom: popedom
-        },
-        method: 'get',
-    })
-}
-
-export function workerPageList(queryModel){
-    return request({
-        url:   '/mobile/personHealthLedgerApi/workerPageList',
-        data: Qs.stringify(queryModel),
-        method: 'post',
-        timeout: 30000
-    })
-}
-
-//通知详情
-export function getPersonInfo(popedom) {
-    var formData = new FormData()
-    formData.append('popedom', popedom);
-    return request.post(  '/mobile/personHealthLedgerApi/getPersonInfo',formData)
-}
-export function curDateIsUpload() {
-    return request.get(  '/mobile/personHealthLedgerApi/curDateIsUpload')
-}
-export function getHealthStatusList(){
-    return request.post(  '/mobile/personHealthLedgerApi/getHealthStatusList')
-}
-
-export function uploadPicture(fileData){
-    var formData = new FormData()
-
-    formData.append('subFolder', "personHealthLedger");
-    formData.append('photoFile', fileData, `${+new Date()}.jpg`);
-
-    return request({
-        url:  '/uploadPicture',
-        method: 'post',
-        data: formData
-    })
-}
-
-export function save(report){
-    return request.post( '/mobile/personHealthLedgerApi/save', report,{
-        headers: {
-            "Content-Type": "application/json"
-        },
-        timeout: 30000
-    });
-}
-
-
-//查询学生信息
-export function getDetail(id,popedom) {
-    return request({
-        url: '/mobile/personHealthLedgerApi/detail?id='+id+"&popedom="+popedom,
-        method: 'get',
-    })
-}

src/projects/business/apis/Master/attendance.js

@@ -67,3 +67,22 @@ export function doVerify(params) {
 		method: 'post',
 	})
 }
+
+
+//获取考勤统计时段列表
+export function getAttednanceTimeList(params) {
+	return request({
+		url: '/mobile/workAttendance/findAttendancePeriod',
+		params: params,
+		method: 'get',
+	})
+}
+
+//获取考勤列表数据
+export function getAttednance(params) {
+	return request({
+		url: '/mobile/workAttendance/workAttendanceStat',
+		params: params,
+		method: 'get',
+	})
+}

src/projects/business/apis/Master/health.js

@@ -10,3 +10,166 @@ export function report(params) {
 		method: 'post',
 	})
 }
+
+//获取测温记录
+export function getTemperatureList(params) {
+	return request({
+		url: '/mobile/personDeviceLogApi/queryTemperatureRecordListByEnt',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//获取未测人员列表
+export function queryUnmeasureGroupList(params) {
+	return request({
+		url: '/mobile/PersonDeviceFilterLog/queryUnmeasureGroupList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//获取管理员的公司列表
+export function getCompanyList(params) {
+	return request({
+		url: '/mobile/personDeviceLogApi/queryCompanyList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//切换当前管理的单位
+export function switchCompany(params) {
+	return request({
+		url: '/mobile/personInfoApi/switchCompany',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//获取考勤统计时段列表
+export function getAttednanceTimeList(params) {
+	return request({
+		url: '/mobile/workAttendance/findAttendancePeriod',
+		params: params,
+		method: 'get',
+	})
+}
+
+//获取考勤列表数据
+export function getAttednance(params) {
+	return request({
+		url: '/mobile/workAttendance/workAttendanceStat',
+		params: params,
+		method: 'get',
+	})
+}
+
+//获取健康档案列表
+export function getHealthyPersonList(params) {
+	return request({
+		url: '/mobile/IndividualLogApi/healthyPersonList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+
+//
+export function healthShowNumData(params) {
+	return request({
+		url: '/mobile/healthShowApi/numData',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+//
+export function healthShowPicData(params) {
+	return request({
+		url: '/mobile/healthShowApi/picData',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//获取异常统计
+export function getAbnormalStatistics(params) {
+	return request({
+		url: '/mobile/personDeviceLogApi/unusualStatistics',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+//获取未检测人员列表
+export function getUndetectedPersonList(params) {
+	return request({
+		url: '/mobile/personDeviceLogApi/undetectedPersonList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//获取健康档案统计,popedom默认1查用户  3查职工
+export function getHealthyCodeStat(companyId, popedom) {
+	return request({
+		url: '/mobile/healthShowApi/healthyCodeStat',
+		params: {
+			companyId: companyId,
+			popedom: popedom
+		},
+		method: 'get',
+	})
+}
+
+export function workerPageList(queryModel) {
+	return request({
+		url: '/mobile/personHealthLedgerApi/workerPageList',
+		data: Qs.stringify(queryModel),
+		method: 'post',
+		timeout: 30000
+	})
+}
+
+//通知详情
+export function getPersonInfo(popedom) {
+	var formData = new FormData()
+	formData.append('popedom', popedom);
+	return request.post('/mobile/personHealthLedgerApi/getPersonInfo', formData)
+}
+export function curDateIsUpload() {
+	return request.get('/mobile/personHealthLedgerApi/curDateIsUpload')
+}
+export function getHealthStatusList() {
+	return request.post('/mobile/personHealthLedgerApi/getHealthStatusList')
+}
+
+export function uploadPicture(fileData) {
+	var formData = new FormData()
+
+	formData.append('subFolder', "personHealthLedger");
+	formData.append('photoFile', fileData, `${+new Date()}.jpg`);
+
+	return request({
+		url: '/uploadPicture',
+		method: 'post',
+		data: formData
+	})
+}
+
+export function save(report) {
+	return request.post('/mobile/personHealthLedgerApi/save', report, {
+		headers: {
+			"Content-Type": "application/json"
+		},
+		timeout: 30000
+	});
+}
+
+
+//查询学生信息
+export function getDetail(id, popedom) {
+	return request({
+		url: '/mobile/personHealthLedgerApi/detail?id=' + id + "&popedom=" + popedom,
+		method: 'get',
+	})
+}

src/projects/business/apis/Master/person.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//获取设备列表
+export function getDeviceList() {
+	return request({
+		url: '/mobile/personDeviceLogApi/getDeviceList',
+		data: Qs.stringify({}),
+		method: 'post',
+	})
+}
+
+//增加人员
+export function addPerson(params) {
+	return request({
+		url: '/mobile/personInfoApi/add',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/router/common.js

@@ -31,6 +31,17 @@ const routesCommon = [
 							title: '消息详情',
 						}
 					},
+					//发送通知
+					{
+						path: 'send',
+						name: 'CommonNoticeSend',
+						component: () => import('../views/Common/Notice/Send.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '发送通知',
+						}
+					},
 				]
 			},
 			//健康
@@ -74,6 +85,24 @@ const routesCommon = [
 
 				]
 			},
+			//设备
+			{
+				path: 'device',
+				component: () => import('../views/Layout.vue'),
+				children: [
+					//设备列表
+					{
+						path: 'list',
+						name: 'CommonDeviceList',
+						component: () => import('@/views/Common/Device/List.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '设备列表',
+						}
+					},
+				],
+			}
 
 		],
 	}

src/projects/business/router/houseKeeper.js

@@ -1,428 +0,0 @@
-const routesHouseKeeper = [
-	/***管家***/
-	{
-		path: '/houseKeeper',
-		component: () => import('../views/Layout.vue'),
-		children: [
-			//监管端
-			{
-				path: 'control',
-				component: () => import('../views/Layout.vue'),
-				children: [
-					//监管端主页
-					{
-						path: '',
-						name: 'HouseKeeperControl',
-						component: () => import('../views/HouseKeeper/Control/Home.vue'),
-						meta: {
-							requireAuth: false,
-							role: [],
-							title: '监管端主页',
-						}
-					},
-					//个人中心
-					{
-						path: 'center',
-						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: '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: 'deviceList',
-						name: 'HouseKeeperControlDeviceList',
-						component: () => import('../views/HouseKeeper/Control/DeviceList.vue'),
-						meta: {
-							requireAuth: false,
-							role: [],
-							title: '设备状态列表',
-						}
-					},
-					//健康
-					{
-						path: 'health',
-						component: () => import('../views/Layout.vue'),
-						children: [
-							//健康公示墙
-							{
-								path: 'wall',
-								name: 'HouseKeeperControlHealthWall',
-								component: () => import('../views/HouseKeeper/Control/Health/Wall.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '健康公示',
-								}
-							},
-							//异常统计
-							{
-								path: 'abnormalStatistics',
-								name: 'HouseKeeperControlHealthAbnormalStatistics',
-								component: () => import('../views/HouseKeeper/Control/Health/AbnormalStatistics.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '异常统计',
-								}
-							},
-							//职工台账
-							{
-								path: 'worker',
-								name: 'HouseKeeperControlHealthWorker',
-								component: () => import('../views/HouseKeeper/Control/Health/Worker.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '职工台账',
-								}
-							},
-							//职工台账详情
-							{
-								path: 'workerInfo',
-								name: 'HouseKeeperControlHealthWorkerInfo',
-								component: () => import('../views/HouseKeeper/Control/Health/WorkerInfo.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '职工台账详情',
-								}
-							},
-							//职工测温
-							{
-								path: 'workerTemperature',
-								name: 'HouseKeeperControlHealthWorkerTemperature',
-								component: () => import('../views/HouseKeeper/Control/Health/WorkerTemperature.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '职工测温',
-								}
-							},
-							//异常记录
-							{
-								path: 'abnormalRecord',
-								name: 'HouseKeeperControlHealthAbnormalRecord',
-								component: () => import('../views/HouseKeeper/Control/Health/AbnormalRecord.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '异常记录',
-								}
-							},
-							//未测人员
-							{
-								path: 'noTemperatureRecord',
-								name: 'HouseKeeperControlHealthNoTemperatureRecord',
-								component: () => import('../views/HouseKeeper/Control/Health/NoTemperatureRecord.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '未测人员',
-								}
-							},
-							//访客测温
-							{
-								path: 'guestTemperature',
-								name: 'HouseKeeperControlHealthGuestTemperature',
-								component: () => import('../views/HouseKeeper/Control/Health/GuestTemperature.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									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: 'person',
-						component: () => import('../views/Layout.vue'),
-						children: [
-							//添加人员
-							{
-								path: 'add',
-								name: 'HouseKeeperAdminPersonAdd',
-								component: () => import('../views/HouseKeeper/Admin/Person/Add.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '添加人员',
-								}
-							},
-							//添加人员选择设备
-							{
-								path: 'device',
-								name: 'HouseKeeperAdminPersonDevice',
-								component: () => import('../views/HouseKeeper/Admin/Person/Device.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '添加人员选择设备',
-								}
-							},
-						]
-					},
-
-					//健康
-					{
-						path: 'health',
-						component: () => import('../views/Layout.vue'),
-						children: [
-							//健康档案
-							{
-								path: 'archives',
-								name: 'HouseKeeperAdminlHealthArchives',
-								component: () => import('../views/HouseKeeper/Admin/Health/Archives.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '健康档案',
-								}
-							},
-							//测温记录
-							{
-								path: 'temperatureRecord',
-								name: 'HouseKeeperAdminHealthTemperatureRecord',
-								component: () => import('../views/HouseKeeper/Admin/Health/TemperatureRecord.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '测温记录',
-								}
-							},
-							//异常记录
-							{
-								path: 'abnormalRecord',
-								name: 'HouseKeeperAdminHealthAbnormalRecord',
-								component: () => import('../views/HouseKeeper/Admin/Health/AbnormalRecord.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '异常记录',
-								}
-							},
-							//未测人员
-							{
-								path: 'noTemperatureRecord',
-								name: 'HouseKeeperAdminHealthNoTemperatureRecord',
-								component: () => import('../views/HouseKeeper/Admin/Health/NoTemperatureRecord.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '未测人员',
-								}
-							},
-						],
-					},
-
-					//考勤
-					{
-						path: 'attendance',
-						component: () => import('../views/Layout.vue'),
-						children: [
-							//考勤记录列表
-							{
-								path: 'list',
-								name: 'HouseKeeperAdminAttendanceList',
-								component: () => import('../views/HouseKeeper/Admin/Attendance/List.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '考勤记录列表',
-								}
-							},
-							//考勤记录测温详情
-							{
-								path: 'temperatureInfo',
-								name: 'HouseKeeperAdminAttendanceTemperatureInfo',
-								component: () => import('../views/HouseKeeper/Admin/Attendance/TemperatureInfo.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '考勤记录测温详情',
-								}
-							},
-							//考勤记录补卡详情
-							{
-								path: 'supplementInfo',
-								name: 'HouseKeeperAdminAttendanceSupplementInfo',
-								component: () => import('../views/HouseKeeper/Admin/Attendance/SupplementInfo.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '考勤记录补卡详情',
-								}
-							},
-							//考勤记录异地打卡详情
-							{
-								path: 'outsideInfo',
-								name: 'HouseKeeperAdminAttendanceOutsideInfo',
-								component: () => import('../views/HouseKeeper/Admin/Attendance/OutsideInfo.vue'),
-								meta: {
-									requireAuth: false,
-									role: [],
-									title: '考勤记录异地打卡详情',
-								}
-							},
-						]
-					},
-
-				]
-			},
-
-			//门卫物业
-			{
-				path: 'property',
-				component: () => import('../views/Layout.vue'),
-				children: [
-					//门卫物业主页
-					{
-						path: '',
-						name: 'HouseKeeperProperty',
-						component: () => import('../views/HouseKeeper/Property/Home.vue'),
-						meta: {
-							requireAuth: false,
-							role: [],
-							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: '消息',
-						}
-					},
-				],
-			},
-
-		],
-	},
-]
-
-export default routesHouseKeeper

src/projects/business/router/index.js

@@ -5,8 +5,6 @@ import VueRouter from 'vue-router'
 import routesCommon from './common'
 //访客
 import routesGuest from './guest'
-//管家
-import routesHouseKeeper from './houseKeeper'
 //业主
 import routesMaster from './master'
 
@@ -26,7 +24,7 @@ const routesIndex = [
 	},
 ]
 
-const routes = routesIndex.concat(routesCommon, routesGuest, routesHouseKeeper, routesMaster);
+const routes = routesIndex.concat(routesCommon, routesGuest, routesMaster);
 
 const router = new VueRouter({
 	//base: process.env.BASE_URL,

src/projects/business/router/master.js

@@ -374,7 +374,7 @@ const routesMaster = [
 							title: '考勤记录',
 						}
 					},
-					//考勤补卡申请详情
+					//考勤补卡申请/异地打卡详情
 					{
 						path: 'info',
 						name: 'MasterAttendanceInfo',
@@ -451,6 +451,29 @@ const routesMaster = [
 							title: '请假提交',
 						}
 					},
+
+					//考勤统计列表
+					{
+						path: 'statisticList',
+						name: 'MasterAttendanceStatisticList',
+						component: () => import('../views/Master/Attendance/StatisticList.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '考勤统计列表',
+						}
+					},
+					//考勤记录测温详情
+					{
+						path: 'temperatureInfo',
+						name: 'MasterAttendanceTemperatureInfo',
+						component: () => import('../views/Master/Attendance/TemperatureInfo.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '考勤记录测温详情',
+						}
+					},
 				]
 			},
 
@@ -533,8 +556,148 @@ const routesMaster = [
 							title: '疫情上报',
 						}
 					},
+					//健康档案
+					{
+						path: 'archives',
+						name: 'MasterHealthArchives',
+						component: () => import('../views/Master/Health/Archives.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '健康档案',
+						}
+					},
+					//测温记录
+					{
+						path: 'temperatureRecord',
+						name: 'MasterHealthTemperatureRecord',
+						component: () => import('../views/Master/Health/TemperatureRecord.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '测温记录',
+						}
+					},
+					//异常记录
+					{
+						path: 'abnormalRecord',
+						name: 'MasterHealthAbnormalRecord',
+						component: () => import('../views/Master/Health/AbnormalRecord.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '异常记录',
+						}
+					},
+					//未测人员
+					{
+						path: 'noTemperatureRecord',
+						name: 'MasterHealthNoTemperatureRecord',
+						component: () => import('../views/Master/Health/NoTemperatureRecord.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '未测人员',
+						}
+					},
+					//健康公示墙
+					{
+						path: 'wall',
+						name: 'MasterHealthWall',
+						component: () => import('../views/Master/Health/Wall.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '健康公示',
+						}
+					},
+					//异常统计
+					{
+						path: 'abnormalStatistics',
+						name: 'MasterHealthAbnormalStatistics',
+						component: () => import('../views/Master/Health/AbnormalStatistics.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '异常统计',
+						}
+					},
+					//职工台账
+					{
+						path: 'worker',
+						name: 'MasterHealthWorker',
+						component: () => import('../views/Master/Health/Worker.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '职工台账',
+						}
+					},
+					//职工台账详情
+					{
+						path: 'workerInfo',
+						name: 'MasterHealthWorkerInfo',
+						component: () => import('../views/Master/Health/WorkerInfo.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '职工台账详情',
+						}
+					},
+					//职工测温
+					{
+						path: 'workerTemperature',
+						name: 'MasterHealthWorkerTemperature',
+						component: () => import('../views/Master/Health/WorkerTemperature.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '职工测温',
+						}
+					},
+					//访客测温
+					{
+						path: 'guestTemperature',
+						name: 'MasterHealthGuestTemperature',
+						component: () => import('../views/Master/Health/GuestTemperature.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '访客测温',
+						}
+					},
 				],
-			}
+			},
+
+			//人员
+			{
+				path: 'person',
+				component: () => import('../views/Layout.vue'),
+				children: [
+					//添加人员
+					{
+						path: 'add',
+						name: 'MasterPersonAdd',
+						component: () => import('../views/Master/Person/Add.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '添加人员',
+						}
+					},
+					//添加人员选择设备
+					{
+						path: 'device',
+						name: 'MasterPersonSelectDevice',
+						component: () => import('../views/Master/Person/SelectDevice.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '添加人员选择设备',
+						}
+					},
+				]
+			},
 
 		],
 	},

src/projects/business/views/HouseKeeper/Control/DeviceList.vue → src/projects/business/views/Common/Device/List.vue

@@ -1,10 +1,10 @@
 <template>
-<div>
+	<div>
 
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"></top-header>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
 
-	<div class="mui-content">
+		<div class="mui-content">
 			<div class="mui-content-padded">
 				<h5>
 					设备列表
@@ -17,7 +17,7 @@
 
 			<ul class="mui-table-view">
 				<li class="mui-table-view-cell mui-media" v-for="(device,index) in devices">
-					<a  >
+					<a>
 						<div class="mui-media-body flew-sp">
 							{{index+1}}.{{device.aliasName}}
 							<h4 class='flew-items'>
@@ -31,14 +31,14 @@
 			</ul>
 
 		</div>
-	<loading :visible="isLoading"></loading>
+		<loading :visible="isLoading"></loading>
 
-</div>
+	</div>
 </template>
 
 
 <script>
-	import * as API_Control from '@/apis/HouseKeeper/control'
+	import * as API_Device from '@/apis/Common/device'
 
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
@@ -49,7 +49,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'HouseKeeperControlDeviceList',
+		name: 'CommonDeviceList',
 		components: {
 			Common,
 			Loading,
@@ -58,32 +58,30 @@
 		data() {
 			return {
 				pageTitle: '设备列表',
-				devices:[],
+				devices: [],
 				isLoading: false,
-				onNum:0,
-				offNum:0,
+				onNum: 0,
+				offNum: 0,
 			}
 		},
 		created() {
-			this.pageTitle=this.person_data.companyName;
+			this.pageTitle = this.person_data.companyName;
 		},
 		methods: {
-
-			//提交
+			//获取列表
 			getList() {
-
-				API_Control.listOfDevice({
-					schoolId : this.person_data.companyId
-				}).then(data=>{
+				API_Device.listOfDevice({
+					schoolId: this.person_data.companyId
+				}).then(data => {
 					this.devices = data;
-					for(var i in data){
-						if(data[i].isOnline){
+					for (var i in data) {
+						if (data[i].isOnline) {
 							this.onNum++;
-						}else{
+						} else {
 							this.offNum++;
 						}
 					}
-				}).catch(error=>{
+				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
 				})
@@ -110,4 +108,4 @@
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
-</style>
+</style>

src/projects/business/views/HouseKeeper/Control/SendNotice.vue → src/projects/business/views/Common/Notice/Send.vue

@@ -1,18 +1,15 @@
 <template>
-<div>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
 
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"></top-header>
-
-
-	<div class="mui-content margin60">
+		<div class="mui-content margin60">
 			<form class="mui-input-group vongi-send">
 				<div class="mui-input-row">
 					<label>通知标题</label>
-					<input type="text" v-model="addForm.title"  placeholder="请输入标题">
+					<input type="text" v-model="addForm.title" placeholder="请输入标题">
 				</div>
 
-
 				<textarea-check v-model="addForm.content" :max="1000" :placeholder="'请填写内容，最多可输入1000字'"></textarea-check>
 
 			</form>
@@ -21,14 +18,14 @@
 			<div class="bindfyy-btn">
 				<button type="submit" class="mui-btn mui-btn-primary " @click="submit">发送</button></div>
 		</div>
-	<loading :visible="isLoading"></loading>
+		<loading :visible="isLoading"></loading>
 
-</div>
+	</div>
 </template>
 
 
 <script>
- 	import * as API_Control from '@/apis/HouseKeeper/control'
+	import * as API_Notice from '@/apis/Common/notice'
 
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
@@ -40,11 +37,12 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'HouseKeeperControlSendNotice',
+		name: 'CommonNoticeSend',
 		components: {
 			Common,
 			Loading,
-			TopHeader,TextareaCheck
+			TopHeader,
+			TextareaCheck
 		},
 		data() {
 			return {
@@ -80,12 +78,12 @@
 			submit() {
 				if (this.checkForm()) {
 					this.isLoading = true;
-					API_Control.sendMessage(this.addForm).then(response => {
+					API_Notice.sendMessage(this.addForm).then(response => {
 						this.isLoading = false;
 						mui.toast("发送成功");
 						//跳转首页
 						this.$router.push({
-							name: 'HouseKeeperControl',
+							name: 'Master',
 							query: {}
 						})
 
@@ -111,5 +109,5 @@
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
-<style>
+<style scoped>
 </style>

src/projects/business/views/HouseKeeper/Admin/Attendance/OutsideInfo.vue

@@ -1,171 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
-
-		<div class="mui-content vongi-wordcard">
-			<div class="mui-content-padded vongi-wordcard-top">
-				<div class="mui-media-object mui-pull-left">
-					<img :src="detail.faceImageUrl" v-image-preview>
-				</div>
-				<div class="mui-media-body">
-					{{detail.personName}}
-					<p class='mui-ellipsis'><span class="colorfe616c">{{detail.typeN}}</span>申请</p>
-				</div>
-				<button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined '+(detail.status>0?(detail.status==1?'status_a':'status_r'):'')">
-					{{detail.status>0?(detail.status==1?'已同意':'已拒绝'):'未审核'}}
-				</button>
-			</div>
-
-			<div class="mui-content-padded vongi-wordcard-center">
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请类型</div>
-						<span v-text="detail.typeN"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">所在部门</div>
-						<span v-text="detail.companyName"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请班次</div>
-						<span class="colorf6f448" v-text="detail.fillAttendanceDayAndTime"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请时间</div>
-						<span v-text="detail.createTime"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请理由</div>
-						<span class="colorf8b155" v-text="detail.content"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">打卡位置</div>
-						<span v-text="detail.address"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">相关照片</div>
-						<span class="vongi-yddk-dat-photo flew">
-							<div class="mui-col-xs-3" v-for="(item,index) in picList">
-								<img :src="item" v-image-preview />
-							</div>
-						</span>
-					</li>
-				</ul>
-			</div>
-			<div class="mui-content-padded vongi-wordcard-center">
-				<h5>审批意见</h5>
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">审批人</div>
-						<span v-text="detail.approvalPersonName"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">审批时间</div>
-						<span>2020-04-19 07:30:56</span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">审批编号</div>
-						<span v-text="detail.approvalNo"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">审批意见</div>
-						<span class="colorf6f448" v-text="detail.approvalContent"></span>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as API_Attendance from '@/apis/Master/attendance'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'HouseKeeperAdminAttendanceOutsideInfo',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '补卡详情',
-
-				isLoading: false,
-
-				subForm: {
-					id: this.$route.query.id
-				},
-				detail: {},
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			//获取详情
-			getDetail() {
-				this.isLoading = true;
-				API_Attendance.getApplyInfo(this.subForm).then(response => {
-
-					this.detail = response;
-
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			//获取详情
-			this.getDetail();
-		},
-		destroyed() {},
-		computed: {
-			picList: {
-				// getter
-				get: function() {
-					if (this.detail && this.detail.fillAttendanceFilesUrl) {
-						return this.detail.fillAttendanceFilesUrl.split(',');
-					} else {
-						return [];
-					}
-				},
-				// setter
-				set: function(newValue) {
-					console.log(newValue)
-				}
-			},
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/sczpfyy.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped>
-	.status_r {
-		color: #fe616c !important;
-		border: 1px solid #fe616c !important;
-	}
-
-	.status_a {
-		color: #05c8af !important;
-		border: 1px solid #05c8af !important;
-	}
-</style>

src/projects/business/views/HouseKeeper/Admin/Attendance/SupplementInfo.vue

@@ -1,163 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
-
-		<div class="mui-content vongi-wordcard">
-			<div class="mui-content-padded vongi-wordcard-top">
-				<div class="mui-media-object mui-pull-left">
-					<img :src="detail.faceImageUrl" v-image-preview>
-				</div>
-				<div class="mui-media-body">
-					{{detail.personName}}
-					<p class='mui-ellipsis'><span class="colorfe616c">{{detail.typeN}}</span>申请</p>
-				</div>
-				<button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined '+(detail.status>0?(detail.status==1?'status_a':'status_r'):'')">
-					{{detail.status>0?(detail.status==1?'已同意':'已拒绝'):'未审核'}}
-				</button>
-			</div>
-
-			<div class="mui-content-padded vongi-wordcard-center">
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请类型</div>
-						<span v-text="detail.typeN"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">所在部门</div>
-						<span v-text="detail.companyName"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请班次</div>
-						<span class="colorf6f448" v-text="detail.fillAttendanceDayAndTime"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请时间</div>
-						<span v-text="detail.createTime"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请理由</div>
-						<span class="colorf8b155" v-text="detail.content"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">相关照片</div>
-					</li>
-					<li class="mui-table-view-cell mui-media fyy-upphoto">
-						<div class="mui-col-xs-3" v-for="(item,index) in picList">
-							<img :src="item" v-image-preview />
-						</div>
-					</li>
-				</ul>
-			</div>
-			<div class="mui-content-padded vongi-wordcard-center">
-				<h5>审批意见</h5>
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell mui-media">
-						审批人:
-						<span v-text="detail.approvalPersonName"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						审批编号：
-						<span v-text="detail.approvalNo"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<span class="colorf8b155" v-text="detail.approvalContent"></span>
-					</li>
-				</ul>
-			</div>
-		</div>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	import * as API_Attendance from '@/apis/Master/attendance'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'HouseKeeperAdminAttendanceSupplementInfo',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '补卡详情',
-
-				isLoading: false,
-
-				subForm: {
-					id: this.$route.query.id
-				},
-				detail: {},
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			//获取详情
-			getDetail() {
-				this.isLoading = true;
-				API_Attendance.getApplyInfo(this.subForm).then(response => {
-
-					this.detail = response;
-
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			//获取详情
-			this.getDetail();
-		},
-		destroyed() {},
-		computed: {
-			picList: {
-				// getter
-				get: function() {
-					if (this.detail && this.detail.fillAttendanceFilesUrl) {
-						return this.detail.fillAttendanceFilesUrl.split(',');
-					} else {
-						return [];
-					}
-				},
-				// setter
-				set: function(newValue) {
-					console.log(newValue)
-				}
-			},
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped>
-	.status_r {
-		color: #fe616c !important;
-		border: 1px solid #fe616c !important;
-	}
-
-	.status_a {
-		color: #05c8af !important;
-		border: 1px solid #05c8af !important;
-	}
-</style>

src/projects/business/views/HouseKeeper/Admin/Center.vue

@@ -1,141 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-
-		<div class="mui-content margin49">
-			<div class="vongi-me">
-				<div class="vongi-me-name">
-					<div class="vongi-me-top">
-						<div class="flew-items">
-							<div class="mui-media-object mui-pull-left">
-								<img :src="person_data.faceImageUrl">
-							</div>
-							<h2>{{wellcomme}}{{person_data.name}}</h2>
-						</div>
-						<h4 v-text="person_data.phone"></h4>
-					</div>
-					<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" @click="editInfo">编辑资料</button>
-				</div>
-				<div class="vongi-me-card">
-					<h2 v-text="person_data.position1"></h2>
-					<h4 v-text="person_data.position2"></h4>
-				</div>
-			</div>
-			<div class="vongi-me-list">
-				<ul class="mui-table-view mui-table-view-chevron vongi-news">
-					<li class="mui-table-view-cell">
-						<a href="tel:4008899619" class="mui-navigate-right">
-							<img src="~$project/assets/img/cicon33.png" width="18" /> 客服热线
-							<span>400-8899-619</span>
-						</a>
-					</li>
-					<li class="mui-table-view-cell">
-						<a href="../home/#/user/role?project=business&exchange=1" class="mui-navigate-right jump">
-							<img src="~$project/assets/img/cicon17.png" width="18" /> 切换身份
-						</a>
-					</li>
-					<li class="mui-table-view-cell">
-						<a href="../home/#/?project=business&exchange=1" class="mui-navigate-right jump">
-							<img src="~$project/assets/img/exit.png" width="18" /> 退出帐号
-						</a>
-					</li>
-				</ul>
-			</div>
-		</div>
-
-		<nav-menu :router="[{name:'HouseKeeperAdmin'},{name:'HouseKeeperAdminMessage'},{name:'HouseKeeperAdminCenter'}]"></nav-menu>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import NavMenu from '@/components/NavMenu.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'MasterCenter',
-		components: {
-			Common,
-			Loading,
-			TopHeader,
-			NavMenu
-		},
-		data() {
-			return {
-				pageTitle: '个人中心',
-
-				isLoading: false,
-			}
-		},
-		created() {
-			//如果不存在则跳转到注册页面
-			if (!this.person_data) {
-				window.location.href = '../home/#/user/login'
-			}
-		},
-		methods: {
-			//修改个人信息
-			editInfo() {
-				this.$router.push({
-					name: 'AdminEditInfo',
-					query: {}
-				})
-			},
-			asynCallBack() {},
-		},
-		mounted() {
-
-		},
-		destroyed() {
-
-		},
-		computed: {
-			wellcomme: {
-				// getter
-				get: function() {
-					let now = new Date(),
-						hour = now.getHours()
-					if (hour < 6) {
-						return '凌晨好！';
-					} else if (hour < 9) {
-						return '早上好！';
-					} else if (hour < 12) {
-						return '上午好';
-					} else if (hour < 14) {
-						return '中午好！';
-					} else if (hour < 17) {
-						return '下午好！';
-					} else if (hour < 19) {
-						return '傍晚好！';
-					} else if (hour < 22) {
-						return '晚上好！';
-					} else {
-						return '夜里好！';
-					}
-				},
-				// setter
-				set: function(newValue) {
-					console.log(newValue)
-				}
-			},
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-
-<style scoped src="$project/assets/css/xpgj.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped>
-</style>

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

@@ -1,243 +0,0 @@
-<template>
-	<div>
-		<common ref="common" @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" headerClass="vongi-bar vongi-index-bar" :rightLink="rightLink" :doRightLink="doRightLink"
-		 :leftShow="false" :titleDownShow="true" :downAction="downAction"></top-header>
-
-		<div class="mui-content margin49">
-			<div class="vongi-icons">
-				<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-grid-head">
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperAdminPersonAdd'}">
-							<img src="~$project/assets/img/icon35.png" />
-							<div class="mui-media-body">添加人员</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperAdminHealthTemperatureRecord'}">
-							<img src="~$project/assets/img/icon05.png" />
-							<div class="mui-media-body">测温记录</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperAdminHealthAbnormalRecord'}">
-							<img src="~$project/assets/img/icon49.png" />
-							<div class="mui-media-body">异常记录</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperAdminHealthNoTemperatureRecord'}">
-							<img src="~$project/assets/img/icon52.png" />
-							<div class="mui-media-body">未测人员</div>
-						</router-link>
-					</li>
-				</ul>
-				<ul class="mui-table-view mui-grid-view mui-grid-9">
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperAdminlHealthArchives'}">
-							<img src="~$project/assets/img/icon_jiankangdangan.png" />
-							<div class="mui-media-body">健康档案</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperAdminAttendanceList'}">
-							<img src="~$project/assets/img/icon_kaoqintongji.png" />
-							<div class="mui-media-body">考勤统计</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
-						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon_shipinjiankong.png" />
-							<div class="mui-media-body">视频监控</div>
-						</a>
-					</li>
-				</ul>
-			</div>
-			<div class="vongi-index-floor kfz">
-				<h4 class="vongi-floor-title">功能推荐区</h4>
-				<div class="vongi-index-inter flew-sp">
-					<div class="mui-col-xs-6">
-						<div class="vongi-floor-padded">
-							<div class="mui-media-body">
-								<h4 class="mui-ellipsis">关联健康码</h4>
-								<p class="mui-ellipsis">出行更便捷</p>
-							</div>
-							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon15.png" width="54" />
-						</div>
-
-					</div>
-					<div class="mui-col-xs-6">
-						<div class="vongi-floor-padded">
-							<div class="mui-media-body">
-								<h4 class="mui-ellipsis">上传登记照</h4>
-								<p class="mui-ellipsis">打卡快人一步</p>
-							</div>
-							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon18.png" width="54" />
-						</div>
-					</div>
-					<div class="mui-col-xs-12">
-						<div class="vongi-floor-padded">
-							<a href="" class="text-list">
-								<h5 class="mui-ellipsis">9月园区活动通知</h5><span>9月20日</span>
-							</a>
-							<a href="" class="text-list">
-								<h5 class="mui-ellipsis">9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知</h5><span>9月20日</span>
-							</a>
-						</div>
-						<a href="" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></a>
-					</div>
-					<div class="mui-col-xs-12">
-						<div id="slider" class="mui-slider">
-							<div class="mui-slider-group">
-								<!-- 第一张 -->
-								<div class="mui-slider-item">
-									<a href="javascript:void(0)">
-										<img src="~$project/assets/img/02.jpg">
-									</a>
-								</div>
-								<!-- 第二张 -->
-								<div class="mui-slider-item">
-									<a href="javascript:void(0)">
-										<img src="~$project/assets/img/02.jpg">
-									</a>
-								</div>
-							</div>
-							<div class="mui-slider-indicator">
-								<div class="mui-indicator mui-active"></div>
-								<div class="mui-indicator"></div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<nav-menu :router="[{name:'HouseKeeperAdmin'},{name:'HouseKeeperAdminMessage'},{name:'HouseKeeperAdminCenter'}]"></nav-menu>
-
-	</div>
-</template>
-
-<script>
-	require('$project/assets/js/mui.picker.min.js');
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import NavMenu from '@/components/NavMenu.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'HouseKeeperAdmin',
-		components: {
-			Common,
-			Loading,
-			TopHeader,
-			NavMenu
-		},
-		data() {
-			return {
-				rightLink: {
-					show: true,
-					icon: 'icon-jiaohuan',
-					style: 'font-size:14px;color:#fff;',
-					title: '公司管理员'
-				},
-				companyList: [],
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			//获取公司列表
-			getCompanyList() {
-				this.isLoading = true;
-				API_Admin.getCompanyList().then(response => {
-					this.isLoading = false;
-
-					let companyList = [];
-					response.list.forEach(function(item, index) {
-						companyList.push({
-							value: item.id,
-							text: item.name
-						})
-					})
-					this.companyList = companyList;
-
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//切换公司选择
-			downAction() {
-				var picker = new mui.PopPicker();
-				picker.setData(this.companyList);
-				var _this = this;
-				picker.show(function(selectItems) {
-					_this.switchCompany(selectItems[0].value);
-				})
-			},
-			//切换当前公司
-			switchCompany(companyId) {
-				this.isLoading = true;
-				API_Admin.switchCompany({
-					companyId: companyId
-				}).then(response => {
-					this.isLoading = false;
-					this.$refs.common.getDataByOpenId()
-
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//右上角点击事件
-			doRightLink() {
-				window.location.href = '../home/#/user/role?project=business&exchange=1'
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			//获取公司列表
-			this.getCompanyList()
-
-			var gallery = mui('.mui-slider');
-			var slider = gallery.slider({
-				interval: 2000, //自动轮播周期，若为0则不自动播放，默认为0；
-				bounce: true //是否启用回弹
-			});
-		},
-		destroyed() {
-
-		},
-		computed: {
-			pageTitle: {
-				// getter
-				get: function() {
-					return this.person_data ? this.person_data.companyName : '小鹏管家';
-				},
-				// setter
-				set: function(newValue) {
-					console.log(newValue)
-				}
-			},
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpgj.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style src="$project/assets/css/mui.picker.min.css"></style>
-<style scoped>
-</style>

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

@@ -1,130 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" headerClass="vongi-bar" :leftShow="false"></top-header>
-
-		<div class="mui-content margin49">
-			<ul class="mui-table-view vongi-news">
-				<li class="mui-table-view-cell mui-media">
-					<router-link :to="{name:'CommonNotice'}">
-						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/bell1.png">
-						<div class="mui-media-body">
-							<h3 class="flew-sp">通知公告<span class="mui-h6" v-text="lastNotice.createTime"></span></h3>
-							<p class='mui-ellipsis' v-text="lastNotice.title"></p>
-						</div>
-						<!-- <span class="mui-badge mui-badge-danger">5</span> -->
-					</router-link>
-				</li>
-			</ul>
-			<ul class="mui-table-view vongi-news">
-				<li class="mui-table-view-cell mui-media kfz">
-					<a href="javascript:;">
-						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/kaoqin1.png">
-						<div class="mui-media-body">
-							<h3 class="flew-sp">考勤消息<span class="mui-h6">09.20</span></h3>
-							<p class='mui-ellipsis'>考勤打卡提醒</p>
-						</div>
-					</a>
-				</li>
-				<li class="mui-table-view-cell mui-media kfz">
-					<a href="javascript:;">
-						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/audit1.png">
-						<div class="mui-media-body">
-							<h3 class="flew-sp">通知公告<span class="mui-h6">09.20</span></h3>
-							<p class='mui-ellipsis'>9月园区活动通知</p>
-						</div>
-					</a>
-				</li>
-				<li class="mui-table-view-cell mui-media kfz">
-					<a href="javascript:;">
-						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/home1.png">
-						<div class="mui-media-body">
-							<h3 class="flew-sp">通知公告<span class="mui-h6">09.20</span></h3>
-							<p class='mui-ellipsis'>9月园区活动通知</p>
-						</div>
-					</a>
-				</li>
-			</ul>
-		</div>
-
-		<nav-menu :router="[{name:'HouseKeeperAdmin'},{name:'HouseKeeperAdminMessage'},{name:'HouseKeeperAdminCenter'}]"></nav-menu>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	import * as API_Notice from '@/apis/Common/notice'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import NavMenu from '@/components/NavMenu.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'HouseKeeperAdminMessage',
-		components: {
-			Common,
-			Loading,
-			TopHeader,
-			NavMenu
-		},
-		data() {
-			return {
-				pageTitle: '消息',
-
-				isLoading: false,
-
-				lastNotice: {}
-			}
-		},
-		created() {
-			//如果不存在则跳转到注册页面
-			if (!this.person_data) {
-				window.location.href = '../home/#/user/login'
-			}
-		},
-		methods: {
-			//获取最新一条通知消息
-			getLastNotice() {
-				this.isLoading = true;
-				API_Notice.getNoticeList({
-					pageIndex: 1,
-					pageSize: 1,
-				}).then(response => {
-					let data = response.data;
-					if (data.length > 0) {
-						this.lastNotice = data[0];
-					}
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			asynCallBack() {},
-		},
-		mounted() {
-			//获取最新一条通知消息
-			this.getLastNotice();
-		},
-		destroyed() {
-
-		},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpgj.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped>
-</style>

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

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

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

@@ -1,103 +0,0 @@
-<template>
-<div>
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"></top-header>
-
-		<div class="mui-content vongi-dwlist">
-			<ul class="mui-table-view openfyy-list">
-
-				<li class="mui-table-view-cell mui-media"  v-for="(item,index) in companyList" :key="index">
-					<a @click="goto(item.id,item.name)" class="mui-navigate-right">
-						<div class="mui-media-body">
-							{{item.name}}
-							<h4 class='mui-pull-right'><span class="color4fc5f7">{{item.detectedNum}}</span>/<span class="color4fc5f7">{{item.personNum}}</span></h4>
-						</div>
-					</a>
-				</li>
-
-			</ul>
-			<h6>已测：<span class="color4fc5f7">{{sumDetectedNum}}</span>  /  应测：<span class="color4fc5f7">{{sumPersonNum}}</span></h6>
-		</div>
-	<loading :visible="isLoading"></loading>
-
-</div>
-</template>
-
-
-<script>
-	import * as API_Control from '@/apis/HouseKeeper/control'
-
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'HouseKeeperControlCompanyList',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '单位列表',
-
-				isLoading: false,
-
-				companyList: [],
-				sumDetectedNum: 0,
-				sumPersonNum: 0,
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			goto(id,name){
-
-				this.$router.push({
-					name: 'HouseKeeperControlHealthWorkerTemperature',
-					query: {
-						companyId:id,
-						companyName:escape(name)
-					}
-				})
-			},
-			//提交
-			getCompanyList() {
-				this.isLoading = true;
-				API_Control.queryCompanyList().then(response => {
-					this.isLoading = false;
-
-					this.companyList = response.list;
-					this.sumDetectedNum = response.sumDetectedNum;
-					this.sumPersonNum = response.sumPersonNum;
-
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			//获取公司列表
-			this.getCompanyList();
-		},
-		destroyed() {},
-		computed: {
-
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style>
-</style>

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

@@ -1,146 +0,0 @@
-<template>
-<div>
-    <header class="mui-bar mui-bar-nav">
-				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-				<h1 class="mui-title">详情</h1>
-			</header>
-			<div class="mui-content vongi-qingjiadt">
-				<div id="slider" class="mui-slider mui-fullscreen">
-					<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
-						<div class="mui-scroll">
-							<a class="mui-control-item mui-active" href="#item1mobile">
-								访客信息
-							</a>
-							<a class="mui-control-item" href="#item2mobile">
-								核验信息
-							</a>
-						</div>
-					</div>
-					<div class="mui-slider-group vongi-fkdat">
-						<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
-							<div id="scroll1" class="mui-scroll-wrapper">
-								<div class="mui-scroll">
-									<form class="mui-input-group mui-content-padded">
-										<div class="mui-input-row">
-											<label>拜访人</label>
-											<span>王后雄</span>
-										</div>
-										<div class="mui-input-row">
-											<label>预约时间</label>
-											<span>2020-9-18 15:00:00</span>
-										</div>
-										<div class="mui-input-row">
-											<label>来访单位</label>
-											<span>湖北荆盛商贸有限公司</span>
-										</div>
-										<div class="mui-input-row">
-											<label>同行人员</label>
-											<span class="vongi-fkdat-name">
-												<div class="flew">
-													<h5>冯</h5>
-													<h5>冯</h5>
-													<h5>冯</h5>
-												</div>							
-											</span>
-										</div>
-										<div class="mui-input-row">
-											<label>来访事由</label>
-											<span>业务洽谈</span>
-										</div>
-										<div class="mui-input-row">
-											<label>车牌号</label>
-											<span>鄂D9999V</span>
-										</div>
-									</form>
-									<form class="mui-input-group mui-content-padded">
-										<div class="mui-input-row">
-											<label>受访人员</label>
-											<span>其他</span>
-										</div>
-										<div class="mui-input-row">
-											<label>审核状态</label>
-											<span class="color55f868">已通过</span>
-										</div>
-										<div class="mui-input-row">
-											<label>审核时间</label>
-											<span>2020-09-17 11:00:00</span>
-										</div>
-										<div class="mui-input-row">
-											<label>访问时间</label>
-											<span>15:00:00-17:30:00</span>
-										</div>
-										<div class="mui-input-row">
-											<label>总耗时</label>
-											<span>2小时30分0秒</span>
-										</div>
-
-									</form>
-								</div>
-							</div>
-						</div>
-						<div id="item2mobile" class="mui-slider-item mui-control-content">
-							<div class="mui-scroll-wrapper">
-								<div class="mui-scroll">
-									<form class="mui-input-group mui-content-padded">
-										<div class="mui-input-row">
-											<label>姓名</label>
-											<span>刘韬</span>
-										</div>
-										
-										<div class="mui-input-row">
-											<label>手机号码</label>
-											<span>15500001111</span>
-										</div>
-										<div class="mui-input-row">
-											<label>身份证号</label>
-											<span>420400199301011010</span>
-										</div>
-										<div class="mui-input-row">
-											<label>入场测温</label>
-											<span class="color55f868">36.3℃</span>
-										</div>
-										<div class="mui-input-row">
-											<label>出场测温</label>
-											<span class="color55f868">36.3℃</span>
-										</div>
-									</form>
-									<form class="mui-input-group mui-content-padded">
-										<div class="mui-input-row">
-											<label>姓名</label>
-											<span>刘韬</span>
-										</div>
-										
-										<div class="mui-input-row">
-											<label>手机号码</label>
-											<span>15500001111</span>
-										</div>
-										<div class="mui-input-row">
-											<label>身份证号</label>
-											<span>420400199301011010</span>
-										</div>
-										<div class="mui-input-row">
-											<label>入场测温</label>
-											<span class="color55f868">36.3℃</span>
-										</div>
-										<div class="mui-input-row">
-											<label>出场测温</label>
-											<span class="color55f868">36.3℃</span>
-										</div>
-									</form>
-								</div>
-							</div>
-						</div>
-
-					</div>
-				</div>
-
-			</div>
-</div>
-</template>
-
-<script>
-</script>
-
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style>
-</style>

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

@@ -1,45 +0,0 @@
-<template>
-<div>
-    <header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">访客记录</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
-		<div class="mui-content vongi-fklist">
-			<ul class="mui-table-view openfyy-list">
-				<li class="mui-table-view-cell mui-media">
-					<a href="javascript:;" class="mui-navigate-right">
-						远鹏众创空间
-					</a>
-					<div class="mui-ellipsis">
-						来访人员：刘韬
-						<span>访问时间：15:00:00-17:30:00</span>
-					</div>
-					<p class="mui-ellipsis">
-						同行人员：2
-						<span>总计耗时：2小时30分0秒</span>
-					</p>
-				</li>
-				<li class="mui-table-view-cell mui-media">
-					<a href="javascript:;" class="mui-navigate-right">
-						远鹏众创空间
-					</a>
-					<div class="mui-ellipsis">
-						来访人员：刘韬
-						<span>访问时间：15:00:00-17:30:00</span>
-					</div>
-					<p class="mui-ellipsis">
-						同行人员：2
-						<span>总计耗时：2小时30分0秒</span>
-					</p>
-				</li>
-			</ul>
-		</div>
-</div>
-</template>
-
-<script>
-</script>
-
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style>
-</style>

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

@@ -1,183 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink"></top-header>
-
-		<div class="mui-content fyy-date">
-			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>{{person_data.companyName}}
-					<a class="mui-navigate-right mui-pull-right" @click="selectData">{{listForm.queryDate}}</a>
-				</h5>
-			</div>
-			<div class="fyydate-out">
-				<div class="fyydate-name">
-					<div v-for="(item,index) in recordList" class="fyydate-name-list">
-						<h5>{{item.name}}</h5>
-					</div>
-				</div>
-				<div class="fyydate-temper">
-					<div v-for="(item,index) in recordList" class="fyydate-temper-list">
-						<div v-for="(iten,index) in item.list" class="fyydate-temper-num">
-							<span>{{iten.recordTime}}</span>
-							<span :class="(iten.temperature<=37) ? 'color05c8af':'colorfe616c'">{{iten.temperature}}</span>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	require('$project/assets/js/mui.picker.min.js');
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import isReachBottom from '$project/utils/isReachBottom'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	import {
-		currentTimeStamp,
-		parseUnixTime
-	} from '$project/utils'
-	export default {
-		name: 'HouseKeeperAdminHealthAbnormalRecord',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '异常记录',
-
-				isLoading: false,
-
-				rightLink: {
-					show: true,
-					icon: 'icon-ziyuan',
-					style: 'font-size:14px;color:#000;',
-					title: '未测人员'
-				},
-
-				listForm: {
-					pageIndex: 1,
-					pageSize: 20,
-					queryDate: '',
-					companyId: '',
-					totalPage: 1,
-					filter: 1
-				},
-				recordList: [],
-			}
-		},
-		created() {
-			if(this.$route.query.companyId){
-				this.listForm.companyId  = this.$route.query.companyId;
-			}else{
-				this.listForm.companyId = this.person_data.companyId;
-			}
-
-			if (this.$route.query.queryDate) {
-				this.listForm.queryDate = this.$route.query.queryDate;
-			} else {
-				this.listForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
-			}
-		},
-		methods: {
-			//获取列表
-			getList() {
-				this.isLoading = true;
-				API_Admin.getTemperatureList(this.listForm).then(response => {
-					if (response) {
-						if (this.listForm.pageIndex == 1) {
-							this.recordList = response.data;
-							this.listForm.pageIndex = response.pageNumber;
-							this.listForm.totalPage = response.totalPage;
-						} else {
-							this.recordList = [
-								...this.recordList,
-								...response.data
-							];
-						}
-					}
-					this.listForm.pageIndex++;
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//下拉事件
-			handleScrool() {
-				if (isReachBottom()) {
-					console.log('到达底部')
-					if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
-						this.getList();
-					} else {
-						return;
-					}
-				}
-			},
-			//选择日期
-			selectData() {
-				var _this = this;
-				var picker = new mui.DtPicker({
-					"type": "date",
-					"beginYear": 2020,
-					"endYear": 2040,
-					"endDate": new Date(),
-					"value": _this.listForm.queryDate
-				});
-				picker.show(function(rs) {
-					_this.listForm.queryDate = rs.text;
-					_this.listForm.pageIndex = 1;
-					_this.getList();
-					picker.dispose();
-				});
-			},
-			doRightLink() {
-				this.$router.push({
-					name: 'HouseKeeperControlHealthNoTemperatureRecord',
-					query: {
-						companyId:this.listForm.companyId
-					}
-				})
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			this.getList();
-			//监控下拉加载事件
-			var _this = this;
-			window.addEventListener('scroll', _this.handleScrool);
-		},
-		destroyed() {
-			//销毁监听事件
-			var _this = this;
-			window.removeEventListener('scroll', _this.handleScrool);
-		},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/sczpfyy.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style src="$project/assets/css/mui.picker.min.css"></style>
-<style scoped>
-</style>

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

@@ -1,136 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
-
-		<div class="mui-content">
-			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>考勤时间未测量体温人员
-					<a class="mui-navigate-right mui-pull-right" @click="selectData">{{subForm.queryDate}}</a>
-				</h5>
-			</div>
-			<div class="mui-row mui-fullscreen fyy-undetect">
-				<div class="mui-col-xs-3">
-					<div class="mui-segmented-control mui-segmented-control-inverted mui-segmented-control-vertical">
-						<a v-for="(item,index) in recordList" @click="showindex = index" :key="index" :class="'mui-control-item '+ (showindex==index?'mui-active':'')"
-						 v-text="item.startTime+'至'+item.endTime"></a>
-					</div>
-				</div>
-				<div class="mui-col-xs-9">
-					<div class="fyy-back">
-						<div v-for="(item,index) in recordList" :key="index" v-show="showindex==index" class="mui-control-content">
-							<ul class="mui-table-view mui-grid-view mui-grid-9">
-								<li v-for="(iten,inden) in item.list" class="mui-table-view-cell mui-media mui-col-xs-4">
-									<div class="mui-media-body" v-text="iten.name"></div>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	require('$project/assets/js/mui.picker.min.js');
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	import {
-		currentTimeStamp,
-		parseUnixTime
-	} from '$project/utils'
-	export default {
-		name: 'HouseKeeperControlHealthNoTemperatureRecord',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '未测人员',
-
-				isLoading: false,
-
-				subForm: {
-					queryDate: '',
-					companyId: '',
-				},
-				recordList: [],
-				showindex: 0,
-			}
-		},
-		created() {
-			if(this.$route.query.companyId){
-				this.subForm.companyId  = this.$route.query.companyId;
-			}else{
-				this.subForm.companyId = this.person_data.companyId;
- 			}
-
-			this.subForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
-		},
-		methods: {
-			//获取列表
-			getList() {
-				this.isLoading = true;
-				API_Admin.queryUnmeasureGroupList(this.subForm).then(response => {
-
-					this.recordList = response.list;
-
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//选择日期
-			selectData() {
-				var _this = this;
-				var picker = new mui.DtPicker({
-					"type": "date",
-					"beginYear": 2020,
-					"endYear": 2040,
-					"endDate": new Date(),
-					"value": _this.subForm.queryDate
-				});
-				picker.show(function(rs) {
-					_this.subForm.queryDate = rs.text;
-					_this.getList();
-					picker.dispose();
-				});
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			//获取列表
-			this.getList();
-		},
-		destroyed() {},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/sczpfyy.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style src="$project/assets/css/mui.picker.min.css"></style>
-<style scoped>
-</style>

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

@@ -1,159 +0,0 @@
-<template>
-<div>
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"></top-header>
-
-
-			<div class="mui-content vongi-qingjiadt">
-				<div class="mui-content-padded">
-					<h5>个人信息</h5>
-				</div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>姓名</label>
-						<span  v-html="detail.name">王后雄</span>
-					</div>
-					<div class="mui-input-row">
-						<label>手机号</label>
-						<span v-html="detail.phone"> </span>
-					</div>
-					<div class="mui-input-row">
-						<label>公司名称</label>
-						<span   v-html="detail.companyName"></span>
-					</div>
-					<div class="mui-input-row">
-						<label>工号</label>
-						<span> </span>
-					</div>
-
-					<div class="mui-input-row">
-						<label>岗位</label>
-						<span> </span>
-					</div>
-
-				</form>
-				<div class="mui-content-padded">
-					<h5>健康状态</h5>
-				</div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label style="width:50%">自身健康情况</label>
-						<span v-html="detail.personHealthLedger.healthStatusN"> </span>
-					</div>
-					<div class="mui-input-row">
-						<label>今日体温</label>
-						<span  v-html="detail.personHealthLedger.temperature+'°C'">36.3</span>
-					</div>
-					<div class="mui-input-row">
-						<label>其他情况</label>
-<!--						<span>无</span>-->
-						<textarea class="mui-input-textarea" readonly v-html="detail.personHealthLedger.healthRemark"></textarea>
-
-					</div>
-					<div class="mui-input-row">
-						<label style="width:70%">家庭成员身体健康情况</label>
-						<span v-html="detail.personHealthLedger.familyStatusN">健康</span>
-					</div>
-					<div class="mui-input-row">
-						<label style="width:50%">家庭成员健康码</label>
-						<span class="vongi-yddk-dat-photo">
-							<div class="flew">
-								<div class="mui-col-xs-3" v-for="(code,index) in detail.personHealthLedger.familyGreenCode.split(',')">
-									<img :src="code+ '?x-oss-process=image/resize,m_fill,w_128,h_128'" width="100%"/>
-								</div>
-							</div>							
-						</span>
-					</div>
-					<div class="mui-input-row">
-						<label style="width:70%" v-html="detail.personHealthLedger.isGoto?'是':'否'">假期是否曾前往重点疫区</label>
-						<span>否</span>
-					</div>
-					<div class="mui-input-row">
-						<label style="width:70%" v-html="detail.personHealthLedger.isTouch?'是':'否'">是否接触重点疫区高危人群</label>
-						<span>否</span>
-					</div>
-				</form>
-
-			</div>
-	<loading :visible="isLoading"></loading>
-
-</div>
-</template>
-
-
-<script>
- 	import * as API_ControlHealth from '@/apis/HouseKeeper/control/health'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	import {
-		currentTimeStamp,
-		parseUnixTime
-	} from '$project/utils'
-	export default {
-		name: 'HouseKeeperControlHealthWorkerInfo',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '职工台账详情',
-
-				id: '',
-				detail: {
-					personHealthLedger :{
-						healthStatusN:null,
-						familyGreenCode:""
-					}
-				},
-				isLoading: false,
-			}
-		},
-		created() {
-			this.id = this.$route.query.id;
-		},
-		methods:  {
-			//获取详情
-			getDetail() {
-				this.isLoading = true;
-
-				API_ControlHealth.getDetail(this.id,'3').then(response => {
-					this.isLoading = false;
-
-					this.detail = response;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},asynCallBack(){},
-		},
-		mounted() {
-			this.getDetail();
-
-		},
-
-
-		destroyed() {
-
-		},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style>
-</style>

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

@@ -1,187 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" headerClass="vongi-bar vongi-index-bar" :rightLink="rightLink" :doRightLink="doRightLink"
-		 :leftShow="false" :titleDownShow="true" :downAction="downAction"></top-header>
-
-		<div class="mui-content margin49">
-			<div class="vongi-icons">
-				<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-grid-head">
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperControlSendNotice'}">
-							<img src="~$project/assets/img/icon13.png" />
-							<div class="mui-media-body">发送通知</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon34.png" />
-							<div class="mui-media-body">职工台账</div>
-						</a>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperControlHealthAbnormalStatistics'}">
-							<img src="~$project/assets/img/icon50.png" />
-							<div class="mui-media-body">异常统计</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperControlHealthWall'}">
-							<img src="~$project/assets/img/icon16.png" />
-							<div class="mui-media-body">健康公示</div>
-						</router-link>
-					</li>
-				</ul>
-				<ul class="mui-table-view mui-grid-view mui-grid-9">
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperControlCompanyList'}">
-							<img src="~$project/assets/img/icon_danweiliebiao.png" />
-								<div class="mui-media-body">单位列表</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperControlHealthWorkerTemperature'}">
-							<img src="~$project/assets/img/icon_cewenjilu.png" />
-							<div class="mui-media-body">职工测温</div>
-						</router-link>
-					</li>
-                    <li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<router-link :to="{name:'HouseKeeperControlHealthGuestTemperature'}">
-
-						<img src="~$project/assets/img/icon_fangkecewen.png" />
-							<div class="mui-media-body">访客测温</div>
-						</router-link>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon_fangkejilu.png" />
-							<div class="mui-media-body">访客记录</div>
-						</a>
-					</li>
-                    <li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon_shebeizhuangtai.png" />
-							<div class="mui-media-body">设备状态</div>
-						</a>
-					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon_shipinjiankong.png" />
-							<div class="mui-media-body">视频监控</div>
-						</a>
-					</li>
-				</ul>
-			</div>
-			<div class="vongi-index-floor">
-				<div class="vongi-index-inter flew-sp">
-					<div class="mui-col-xs-6">
-						<div class="vongi-floor-num">
-							<div class="mui-media-body vongi-bag-blue">
-								26	
-							</div>
-                            <h4 class="mui-ellipsis">今日到岗人数</h4>							
-						</div>
-					</div>
-					<div class="mui-col-xs-6">
-						<div class="vongi-floor-num">
-							<div class="mui-media-body vongi-bag-green">
-								26	
-							</div>
-                            <h4 class="mui-ellipsis">体温正常人数</h4>							
-						</div>
-					</div>
-					<div class="mui-col-xs-12">
-						<div class="vongi-floor-padded">
-							<a href="" class="text-list">
-								<h5 class="mui-ellipsis">9月园区活动通知</h5><span>9月20日</span>
-							</a>
-							<a href="" class="text-list">
-								<h5 class="mui-ellipsis">9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知</h5><span>9月20日</span>
-							</a>
-						</div>
-						<a href="" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></a>
-					</div>
-					
-				</div>
-			</div>
-		</div>
-
-		<nav-menu :router="[{name:'HouseKeeperAdmin'},{name:'HouseKeeperAdminMessage'},{name:'HouseKeeperAdminCenter'}]"></nav-menu>
-
-	</div>
-</template>
-
-<script>
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import NavMenu from '@/components/NavMenu.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'HouseKeeperAdmin',
-		components: {
-			Common,
-			Loading,
-			TopHeader,
-			NavMenu
-		},
-		data() {
-			return {
-				rightLink: {
-					show: true,
-					icon: 'icon-jiaohuan',
-					style: 'font-size:14px;color:#fff;',
-					title: '公司管理员'
-				},
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			//右上角点击事件
-			doRightLink() {
-
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			var gallery = mui('.mui-slider');
-			var slider = gallery.slider({
-				interval: 2000, //自动轮播周期，若为0则不自动播放，默认为0；
-				bounce: true //是否启用回弹
-			});
-		},
-		destroyed() {
-
-		},
-		computed: {
-			pageTitle: {
-				// getter
-				get: function() {
-					return this.person_data ? this.person_data.companyName : '小鹏管家';
-				},
-				// setter
-				set: function(newValue) {
-					console.log(newValue)
-				}
-			},
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpgj.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped>
-</style>

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

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

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

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

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

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

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

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

src/projects/business/views/HouseKeeper/Admin/Attendance/List.vue → src/projects/business/views/Master/Attendance/StatisticList.vue

@@ -31,7 +31,7 @@
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
+	import * as API_Attendance from '@/apis/Master/attendance'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
@@ -44,7 +44,7 @@
 		parseUnixTime
 	} from '$project/utils'
 	export default {
-		name: 'HouseKeeperAdminAttendanceList',
+		name: 'MasterAttendanceStatisticList',
 		components: {
 			Common,
 			Loading,
@@ -74,7 +74,7 @@
 			//获取列表
 			getList() {
 				this.isLoading = true;
-				API_Admin.getAttednance(this.subForm).then(response => {
+				API_Attendance.getAttednance(this.subForm).then(response => {
 					this.isLoading = false;
 
 					this.recordList = response.groupList;
@@ -106,7 +106,7 @@
 			//获取时段列表
 			getTimeList() {
 				this.isLoading = true;
-				API_Admin.getAttednanceTimeList(this.subForm).then(response => {
+				API_Attendance.getAttednanceTimeList(this.subForm).then(response => {
 					this.isLoading = false;
 
 					let timeList = [];
@@ -148,7 +148,7 @@
 					if (iten.type == '0' && iten.personDeviceLogId) {
 						//设备打卡
 						this.$router.push({
-							name: 'HouseKeeperAdminAttendanceTemperatureInfo',
+							name: 'MasterAttendanceTemperatureInfo',
 							query: {
 								id: iten.personDeviceLogId
 							}
@@ -156,15 +156,15 @@
 					} else if (iten.type == '1' && iten.fillAttendanceId) {
 						//异地打卡
 						this.$router.push({
-							name: 'HouseKeeperAdminAttendanceOutsideInfo',
+							name: 'MasterAttendanceInfo',
 							query: {
-								id: iten.personDeviceLogId
+								id: iten.fillAttendanceId
 							}
 						})
 					} else if (iten.type == '2' && iten.fillAttendanceId) {
 						//补卡
 						this.$router.push({
-							name: 'HouseKeeperAdminAttendanceSupplementInfo',
+							name: 'MasterAttendanceInfo',
 							query: {
 								id: iten.fillAttendanceId
 							}
@@ -188,7 +188,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-                person_popedom: 'person_popedom',
+				person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Attendance/TemperatureInfo.vue → src/projects/business/views/Master/Attendance/TemperatureInfo.vue

@@ -43,7 +43,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'HouseKeeperAdminAttendanceTemperatureInfo',
+		name: 'MasterAttendanceTemperatureInfo',
 		components: {
 			Common,
 			Loading,

src/projects/business/views/HouseKeeper/Admin/Health/AbnormalRecord.vue → src/projects/business/views/Master/Health/AbnormalRecord.vue

@@ -32,7 +32,7 @@
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
+	import * as API_Health from '@/apis/Master/health'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
@@ -46,7 +46,7 @@
 		parseUnixTime
 	} from '$project/utils'
 	export default {
-		name: 'HouseKeeperAdminHealthAbnormalRecord',
+		name: 'MasterHealthAbnormalRecord',
 		components: {
 			Common,
 			Loading,
@@ -87,7 +87,7 @@
 			//获取列表
 			getList() {
 				this.isLoading = true;
-				API_Admin.getTemperatureList(this.listForm).then(response => {
+				API_Health.getTemperatureList(this.listForm).then(response => {
 					if (response) {
 						if (this.listForm.pageIndex == 1) {
 							this.recordList = response.data;
@@ -137,7 +137,7 @@
 			},
 			doRightLink() {
 				this.$router.push({
-					name: 'HouseKeeperAdminHealthNoTemperatureRecord',
+					name: 'MasterHealthNoTemperatureRecord',
 					query: {}
 				})
 			},

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

@@ -1,14 +1,14 @@
 <template>
-<div>
-    <common @asynCallBack="asynCallBack"></common>
-    <top-header :pageTitle="pageTitle"  ></top-header>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content">
-            <div class="fyy-temper-date">
-                <a @click="selectStartDate" class="mui-col-xs-5" v-text="dataForm.startTime"></a>
-                <span class="mui-col-xs-2">至</span>
-                <a @click="selectEndDate" class="mui-col-xs-5" v-text="dataForm.endTime"></a>
-            </div>
+			<div class="fyy-temper-date">
+				<a @click="selectStartDate" class="mui-col-xs-5" v-text="dataForm.startTime"></a>
+				<span class="mui-col-xs-2">至</span>
+				<a @click="selectEndDate" class="mui-col-xs-5" v-text="dataForm.endTime"></a>
+			</div>
 			<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-statistics">
 				<li class="mui-table-view-cell mui-media mui-col-xs-4">
 					<div class="vongi-statistics-body">
@@ -28,19 +28,19 @@
 					<div class="vongi-statistics-body">
 						<span class="mui-icon mui-icon-home iconfont icon-renshu"></span>
 						<div class="mui-media-body">未测人员</div>
-						<div class="mui-media-body mui-h3 colorf8b155"  v-text="undetectedCount"> </div>
+						<div class="mui-media-body mui-h3 colorf8b155" v-text="undetectedCount"> </div>
 					</div>
 				</li>
 			</ul>
 			<div class="mui-content-padded vongi-yctj-list">
 				<ul class="mui-table-view mui-table-view-chevron">
 					<li class="mui-table-view-cell mui-collapse">
-						<a class="mui-navigate-right"  @touchend="setNowOpen(1)" >异常单位列表</a>
+						<a class="mui-navigate-right" @touchend="setNowOpen(1)">异常单位列表</a>
 						<ul class="mui-table-view mui-table-view-chevron">
 
 							<li class="mui-table-view-cell mui-media" v-for="(item,index) in companyList">
 								<router-link :to="{name: 'HouseKeeperControlHealthAbnormalRecord', query: {companyId: item.id,companyName:doEscape(item.name),filter:1,queryDate:item.date}}"
-											 class="mui-navigate-right">
+								 class="mui-navigate-right">
 									<div class="mui-media-body">
 										{{item.name}}
 										<h4 class='mui-pull-right'><span class="colorfe616c" v-text="item.personCount"></span>人</h4>
@@ -55,12 +55,12 @@
 			<div class="mui-content-padded vongi-yctj-list">
 				<ul class="mui-table-view mui-table-view-chevron">
 					<li class="mui-table-view-cell mui-collapse">
-						<a class="mui-navigate-right"  @touchend="setNowOpen(2)">未检测员工列表</a>
+						<a class="mui-navigate-right" @touchend="setNowOpen(2)">未检测员工列表</a>
 						<ul class="mui-table-view mui-table-view-chevron">
 							<li class="mui-table-view-cell" v-for="(item,index) in personList">
-									<router-link :to="{name: 'CommonHealthCert', query: {personId: item.id}}" class="mui-navigate-right">
-									{{item.name}}<span class="iconfont icon-erweima1 color55f868" :style="'color:'+getGreenCodeColor(item['healthyCode'])" ></span>
-									</router-link>
+								<router-link :to="{name: 'CommonHealthCert', query: {personId: item.id}}" class="mui-navigate-right">
+									{{item.name}}<span class="iconfont icon-erweima1 color55f868" :style="'color:'+getGreenCodeColor(item['healthyCode'])"></span>
+								</router-link>
 							</li>
 
 						</ul>
@@ -68,34 +68,34 @@
 				</ul>
 			</div>
 		</div>
-	<loading :visible="isLoading"></loading>
+		<loading :visible="isLoading"></loading>
 
-</div>
+	</div>
 </template>
 
 <script>
-    require('$project/assets/js/mui.picker.min.js');
-	import * as API_ControlHealth from '@/apis/HouseKeeper/control/health'
-    import Common from '$project/components/Common.vue'
-    import Loading from '$project/components/Loading.vue'
-    import isReachBottom from '$project/utils/isReachBottom'
-    import TopHeader from '$project/components/TopHeader.vue'
-    import {
-        mapGetters,
-        mapMutations
-    } from 'vuex'
-    import {
-        currentTimeStamp,
-        parseUnixTime,
+	require('$project/assets/js/mui.picker.min.js');
+	import * as API_Health from '@/apis/Master/health'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import {
+		currentTimeStamp,
+		parseUnixTime,
 		beforeTimeStamp
-    } from '$project/utils'
-    export default {
-        name: 'HouseKeeperControlHealthAbnormalStatistics',
-        components: {
-            Common,
-            Loading,
-            TopHeader
-        },
+	} from '$project/utils'
+	export default {
+		name: 'MasterHealthAbnormalStatistics',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
 		data() {
 			return {
 				pageTitle: "异常统计",
@@ -144,7 +144,7 @@
 
 		},
 		methods: {
-			asynCallBack(){},
+			asynCallBack() {},
 			setNowOpen(val) {
 				this.nowOpen = val;
 				console.log('当前' + this.nowOpen);
@@ -191,7 +191,7 @@
 			//获取统计数据
 			getUnusalStatistic() {
 				this.isLoading = true;
-				API_ControlHealth.getAbnormalStatistics(this.dataForm).then(response => {
+				API_Health.getAbnormalStatistics(this.dataForm).then(response => {
 					this.isLoading = false;
 
 					this.personTotalCount = response.personTotalCount;
@@ -207,7 +207,7 @@
 			//获取未检测人员列表
 			getPersonList() {
 				this.isLoading = true;
-				API_ControlHealth.getUndetectedPersonList(this.personListForm).then(response => {
+				API_Health.getUndetectedPersonList(this.personListForm).then(response => {
 					this.isLoading = false;
 
 					if (this.personListForm.pageIndex == 1) {

src/projects/business/views/HouseKeeper/Admin/Health/Archives.vue → src/projects/business/views/Master/Health/Archives.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
+	import * as API_Health from '@/apis/Master/health'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
@@ -45,7 +45,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'HouseKeeperAdminlHealthArchives',
+		name: 'MasterHealthArchives',
 		components: {
 			Common,
 			Loading,
@@ -108,7 +108,7 @@
 			//获取绿码统计数据
 			getHealthyCodeStat() {
 				this.isLoading = true;
-				API_Admin.getHealthyCodeStat(this.person_data.companyId).then(response => {
+				API_Health.getHealthyCodeStat(this.person_data.companyId).then(response => {
 					this.isLoading = false;
 					this.statList = response;
 				}).catch(error => {
@@ -119,7 +119,7 @@
 			//获取列表
 			getList() {
 				this.isLoading = true;
-				API_Admin.getHealthyPersonList(this.listForm).then(response => {
+				API_Health.getHealthyPersonList(this.listForm).then(response => {
 					if (response) {
 						if (this.listForm.pageIndex == 1) {
 							this.recordList = response.data;
@@ -172,7 +172,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-                person_popedom: 'person_popedom',
+				person_popedom: 'person_popedom',
 			})
 		}
 	}

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

@@ -1,25 +1,25 @@
 <template>
-<div>
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"></top-header>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
 
-	<div class="mui-content fyy-wall">
+		<div class="mui-content fyy-wall">
 			<div id="slider" class="mui-slider mui-fullscreen fyy-slider vongi-fkwall">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
-						<a class="mui-control-item " :class=" nowItem==''?'mui-active':''" @click="changeItem('')"  style="width:30%">
+						<a class="mui-control-item " :class=" nowItem==''?'mui-active':''" @click="changeItem('')" style="width:30%">
 							全部
 						</a>
-						<a class="mui-control-item"  :class=" nowItem=='1'?'mui-active':''" @click="changeItem('1')"  style="width:36%">
+						<a class="mui-control-item" :class=" nowItem=='1'?'mui-active':''" @click="changeItem('1')" style="width:36%">
 							正常记录
 						</a>
-						<a class="mui-control-item"  :class=" nowItem=='2'?'mui-active':''" @click="changeItem('2')" style="width:34%">
+						<a class="mui-control-item" :class=" nowItem=='2'?'mui-active':''" @click="changeItem('2')" style="width:34%">
 							异常记录
 						</a>
 					</div>
 				</div>
 				<div class="mui-slider-group">
-					<div  id="item1mobile" class="mui-slider-item mui-control-content mui-active">
+					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
 						<div id="scroll1" class="mui-scroll-wrapper">
 							<div class="mui-scroll">
 								<ul class="mui-table-view">
@@ -28,15 +28,15 @@
 										<div class="mui-content-padded">
 											<div class="mui-media-object">
 
-												<img :src="item.faceImage"  >
+												<img :src="item.faceImage">
 
-												<span class="mui-icon iconfont icon-erweima1 " v-if="item.matchStatus!=2"  :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'"></span>
+												<span class="mui-icon iconfont icon-erweima1 " v-if="item.matchStatus!=2" :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'"></span>
 											</div>
 											<div class="mui-media-body">
 												<span v-text="item.personName">冯银银</span>
-												<span class="mui-pull-right "  :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'">{{item.temperature}}</span>
+												<span class="mui-pull-right " :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'">{{item.temperature}}</span>
 											</div>
-											<p>{{item.recordTime?item.recordTime.substring(5,10):''}}  <span>{{item.recordTime?item.recordTime.substring(10,16):''}}</span></p>
+											<p>{{item.recordTime?item.recordTime.substring(5,10):''}} <span>{{item.recordTime?item.recordTime.substring(10,16):''}}</span></p>
 										</div>
 									</li>
 
@@ -49,14 +49,14 @@
 				</div>
 			</div>
 		</div>
-	<loading :visible="isLoading"></loading>
+		<loading :visible="isLoading"></loading>
 
-</div>
+	</div>
 </template>
 
 
 <script>
-	import * as API_ControlWall from '@/apis/HouseKeeper/control/health'
+	import * as API_Health from '@/apis/Master/health'
 
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
@@ -73,7 +73,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'HouseKeeperControlHealthGuestTemperature',
+		name: 'MasterHealthGuestTemperature',
 		components: {
 			Common,
 			Loading,
@@ -94,7 +94,7 @@
 					pageIndex: 1,
 					pageSize: 15,
 					queryDate: '',
-					filter:'',
+					filter: '',
 					totalPage: 1,
 					type: 'visitor'
 				},
@@ -107,7 +107,7 @@
 				recordList: [],
 				isLoading: false,
 				maxTemperature: 37.3,
-				intervalId:null,
+				intervalId: null,
 			}
 		},
 		created() {
@@ -137,7 +137,7 @@
 					}
 				}
 			},
-//item切换事件
+			//item切换事件
 			changeItem(type) {
 				this.nowItem = type;
 				this.listForm.filter = type;
@@ -161,17 +161,19 @@
 				}
 				return list;
 			},
-			goto(id){
+			goto(id) {
 
 				this.$router.push({
 					name: 'HouseKeeperControlHealthWorkerTemperature',
-					query: {id:id}
+					query: {
+						id: id
+					}
 				})
 			},
 			//提交
 			getList() {
 				this.isLoading = true;
-				API_ControlWall.healthShowPicData(this.listForm).then(response => {
+				API_Health.healthShowPicData(this.listForm).then(response => {
 					this.isLoading = false;
 
 					if (this.listForm.pageIndex == 1) {
@@ -206,7 +208,7 @@
 			window.addEventListener('scroll', _this.handleScrool);
 
 			//定时刷新
-			this.intervalId=setInterval(function() {
+			this.intervalId = setInterval(function() {
 				_this.listForm.pageIndex = 1
 
 				//获取详情数据
@@ -218,7 +220,7 @@
 		destroyed() {
 			//销毁监听事件
 			var _this = this;
-			if(this.intervalId){
+			if (this.intervalId) {
 				clearInterval(this.intervalId)
 			}
 			window.removeEventListener('scroll', _this.handleScrool);
@@ -234,4 +236,4 @@
 <style scoped src="$project/assets/css/wallfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
-</style>
+</style>

src/projects/business/views/HouseKeeper/Admin/Health/NoTemperatureRecord.vue → src/projects/business/views/Master/Health/NoTemperatureRecord.vue

@@ -36,7 +36,7 @@
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
+	import * as API_Health from '@/apis/Master/health'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
@@ -49,7 +49,7 @@
 		parseUnixTime
 	} from '$project/utils'
 	export default {
-		name: 'HouseKeeperAdminHealthNoTemperatureRecord',
+		name: 'MasterHealthNoTemperatureRecord',
 		components: {
 			Common,
 			Loading,
@@ -77,7 +77,7 @@
 			//获取列表
 			getList() {
 				this.isLoading = true;
-				API_Admin.queryUnmeasureGroupList(this.subForm).then(response => {
+				API_Health.queryUnmeasureGroupList(this.subForm).then(response => {
 
 					this.recordList = response.list;
 

src/projects/business/views/HouseKeeper/Admin/Health/TemperatureRecord.vue → src/projects/business/views/Master/Health/TemperatureRecord.vue

@@ -32,7 +32,7 @@
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
+	import * as API_Health from '@/apis/Master/health'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
@@ -46,7 +46,7 @@
 		parseUnixTime
 	} from '$project/utils'
 	export default {
-		name: 'HouseKeeperAdminHealthTemperatureRecord',
+		name: 'MasterHealthTemperatureRecord',
 		components: {
 			Common,
 			Loading,
@@ -87,7 +87,7 @@
 			//获取列表
 			getList() {
 				this.isLoading = true;
-				API_Admin.getTemperatureList(this.listForm).then(response => {
+				API_Health.getTemperatureList(this.listForm).then(response => {
 					if (response) {
 						if (this.listForm.pageIndex == 1) {
 							this.recordList = response.data;
@@ -137,7 +137,7 @@
 			},
 			doRightLink() {
 				this.$router.push({
-					name: 'HouseKeeperAdminHealthNoTemperatureRecord',
+					name: 'MasterHealthNoTemperatureRecord',
 					query: {}
 				})
 			},

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

@@ -1,9 +1,9 @@
 <template>
-<div>
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="companyName+pageTitle"></top-header>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="companyName+pageTitle"></top-header>
 
-	<div class="mui-content fyy-wall">
+		<div class="mui-content fyy-wall">
 			<div class="fyy-wall-top">
 				<div class="fyy-wall-date" v-text="queryDate">
 					2020-04-03
@@ -14,7 +14,7 @@
 							<div class="fyy-wall-number fyy-wall-small">
 								<div class="mui-media-body" style="margin-bottom:5px">
 									<span class="mui-icon iconfont icon-renyuanjieshao"></span>
-									<p class="mui-col-xs-7" >已测员工</p>
+									<p class="mui-col-xs-7">已测员工</p>
 									<span class="mui-col-xs-5"><span class="color55f868" v-text="detail.checkedPersonNum">18</span><span class="fyy-danwei">人</span></span>
 								</div>
 								<div class="mui-media-body">
@@ -56,7 +56,8 @@
 
 
 
-									<span class="mui-col-xs-12" style="text-align:center">	<span class="mui-icon iconfont icon-shijian"></span>连续无异常<span class="color55f868"  style="font-size: 20px;margin: 0px 8px;" v-text="detail.normalDays">6</span>天</span>
+									<span class="mui-col-xs-12" style="text-align:center"> <span class="mui-icon iconfont icon-shijian"></span>连续无异常<span
+										 class="color55f868" style="font-size: 20px;margin: 0px 8px;" v-text="detail.normalDays">6</span>天</span>
 
 								</div>
 							</div>
@@ -68,19 +69,19 @@
 			<div id="slider" class="mui-slider mui-fullscreen fyy-slider">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
-						<a class="mui-control-item " :class=" nowItem==''?'mui-active':''" @click="changeItem('')"  style="width:30%">
+						<a class="mui-control-item " :class=" nowItem==''?'mui-active':''" @click="changeItem('')" style="width:30%">
 							全部测温记录
 						</a>
-						<a class="mui-control-item"  :class=" nowItem=='person'?'mui-active':''" @click="changeItem('person')"  style="width:36%">
+						<a class="mui-control-item" :class=" nowItem=='person'?'mui-active':''" @click="changeItem('person')" style="width:36%">
 							内部员工测温记录
 						</a>
-						<a class="mui-control-item"  :class=" nowItem=='visitor'?'mui-active':''" @click="changeItem('visitor')" style="width:34%">
+						<a class="mui-control-item" :class=" nowItem=='visitor'?'mui-active':''" @click="changeItem('visitor')" style="width:34%">
 							访客测温记录
 						</a>
 					</div>
 				</div>
 				<div class="mui-slider-group">
-					<div  id="item1mobile" class="mui-slider-item mui-control-content mui-active">
+					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
 						<div id="scroll1" class="mui-scroll-wrapper">
 							<div class="mui-scroll">
 								<ul class="mui-table-view">
@@ -90,13 +91,13 @@
 											<div class="mui-media-object">
 
 												<img :src="item.faceImage">
-												<span class="mui-icon iconfont icon-erweima1 " v-if="!item.isVistor"  :style="'color:'+getGreenCodeColor(item['person']['healthyCode'])"></span>
+												<span class="mui-icon iconfont icon-erweima1 " v-if="!item.isVistor" :style="'color:'+getGreenCodeColor(item['person']['healthyCode'])"></span>
 											</div>
 											<div class="mui-media-body">
 												<span v-text="item.personName">冯银银</span>
-												<span class="mui-pull-right "  :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'">{{item.temperature}}</span>
+												<span class="mui-pull-right " :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'">{{item.temperature}}</span>
 											</div>
-											<p>{{item.recordTime?item.recordTime.substring(5,10):''}}  <span>{{item.recordTime?item.recordTime.substring(10,16):''}}</span></p>
+											<p>{{item.recordTime?item.recordTime.substring(5,10):''}} <span>{{item.recordTime?item.recordTime.substring(10,16):''}}</span></p>
 										</div>
 									</li>
 
@@ -109,14 +110,14 @@
 				</div>
 			</div>
 		</div>
-	<loading :visible="isLoading"></loading>
+		<loading :visible="isLoading"></loading>
 
-</div>
+	</div>
 </template>
 
 
 <script>
-	import * as API_ControlWall from '@/apis/HouseKeeper/control/health'
+	import * as API_Health from '@/apis/Master/health'
 
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
@@ -133,7 +134,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'HouseKeeperControlHealthWall',
+		name: 'MasterHealthWall',
 		components: {
 			Common,
 			Loading,
@@ -167,14 +168,14 @@
 				recordList: [],
 				isLoading: false,
 				maxTemperature: 37.3,
-				intervalId:null,
+				intervalId: null,
 			}
 		},
 		created() {
 			//赋值时间
 			this.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 
- 			this.detailForm.queryDate = this.queryDate;
+			this.detailForm.queryDate = this.queryDate;
 			this.listForm.queryDate = this.queryDate;
 
 			if (this.$route.query.companyId) {
@@ -196,7 +197,7 @@
 			},
 			getNumData() {
 				this.isLoading = true;
-				API_ControlWall.healthShowNumData(this.detailForm).then(response => {
+				API_Health.healthShowNumData(this.detailForm).then(response => {
 					this.isLoading = false;
 
 					this.detail = response;
@@ -222,7 +223,7 @@
 					}
 				}
 			},
-//item切换事件
+			//item切换事件
 			changeItem(type) {
 				this.nowItem = type;
 				this.listForm.type = type;
@@ -246,17 +247,19 @@
 				}
 				return list;
 			},
-			goto(id){
+			goto(id) {
 
 				this.$router.push({
 					name: 'HouseKeeperControlHealthWorkerTemperature',
-					query: {id:id}
+					query: {
+						id: id
+					}
 				})
 			},
 			//提交
 			getList() {
 				this.isLoading = true;
-				API_ControlWall.healthShowPicData(this.listForm).then(response => {
+				API_Health.healthShowPicData(this.listForm).then(response => {
 					this.isLoading = false;
 
 					if (this.listForm.pageIndex == 1) {
@@ -291,7 +294,7 @@
 			window.addEventListener('scroll', _this.handleScrool);
 
 			//定时刷新
-			this.intervalId=setInterval(function() {
+			this.intervalId = setInterval(function() {
 				_this.listForm.pageIndex = 1
 
 				//获取详情数据
@@ -303,7 +306,7 @@
 		destroyed() {
 			//销毁监听事件
 			var _this = this;
-			if(this.intervalId){
+			if (this.intervalId) {
 				clearInterval(this.intervalId)
 			}
 			window.removeEventListener('scroll', _this.handleScrool);
@@ -319,4 +322,4 @@
 <style scoped src="$project/assets/css/wallfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
-</style>
+</style>

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

@@ -1,39 +1,39 @@
 <template>
-<div>
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"></top-header>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
 
-	<div class="mui-content fyy-wall vongi-zgtz">
+		<div class="mui-content fyy-wall vongi-zgtz">
 			<div class="mui-content-padded fyy-date mui-clearfix">
 				<h5>{{person_data.companyName}}
-					<a  class="mui-navigate-right mui-pull-right" v-html="curDate" @click="selectDate()">2020-03-19</a>
+					<a class="mui-navigate-right mui-pull-right" v-html="curDate" @click="selectDate()">2020-03-19</a>
 				</h5>
 			</div>
 			<div class="vongi-clasadmin">
 				<h4>职工健康码统计</h4>
 				<div class="vongi-clasadmin-list">
 					<div class="vongi-clasadmin-ma mui-col-xs-3" v-for="(item,index) in statList" :key="index">
-						<span   :style="'color:'+getGreenCodeColor(item.healthyCode)" v-text="item.total">2953</span>
+						<span :style="'color:'+getGreenCodeColor(item.healthyCode)" v-text="item.total">2953</span>
 						<div class="mui-media-body" v-text="getCodeStatusName(item.healthyCode)">绿码</div>
 					</div>
 
 				</div>
 				<div class="vongi-zgtz-search">
 					<div class="mui-input-row mui-search">
- 						<input type="search" class="setinput" placeholder="请输入姓名" v-model="setinput" @change="searchK">
+						<input type="search" class="setinput" placeholder="请输入姓名" v-model="setinput" @change="searchK">
 					</div>
 				</div>
 			</div>
 			<div id="slider" class="mui-slider mui-fullscreen">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
-						<a class="mui-control-item " :class="selectedIndex==0?'mui-active':''"  style="width:30%" @click="ckSelectedIndex(0)" >
+						<a class="mui-control-item " :class="selectedIndex==0?'mui-active':''" style="width:30%" @click="ckSelectedIndex(0)">
 							全部<span class="mui-badge" v-html="allCount">3</span>
 						</a>
-						<a class="mui-control-item"   :class="selectedIndex==1?'mui-active':''"  style="width:36%" @click="ckSelectedIndex(1)">
+						<a class="mui-control-item" :class="selectedIndex==1?'mui-active':''" style="width:36%" @click="ckSelectedIndex(1)">
 							正常记录<span class="mui-badge" v-html="doneCount">2</span>
 						</a>
-						<a class="mui-control-item"   :class="selectedIndex==2?'mui-active':''"  style="width:34%" @click="ckSelectedIndex(2)">
+						<a class="mui-control-item" :class="selectedIndex==2?'mui-active':''" style="width:34%" @click="ckSelectedIndex(2)">
 							异常记录<span class="mui-badge" v-html="undoCount">1</span>
 						</a>
 					</div>
@@ -43,17 +43,18 @@
 						<div id="scroll1" class="mui-scroll-wrapper">
 							<div class="mui-scroll vongi-yctj-list">
 								<ul class="mui-table-view mui-table-view-chevron vongi-zgtz">
-									<li class="mui-table-view-cell mui-collapse vongi-archives" v-for="(item,index) in allList" :key="index" >
-										<a class="mui-navigate-right"  >
+									<li class="mui-table-view-cell mui-collapse vongi-archives" v-for="(item,index) in allList" :key="index">
+										<a class="mui-navigate-right">
 											{{item.name}}
 											<h4 class='mui-pull-right'><span class="color4fc5f7">{{item.num2}}</span>/<span class="color4fc5f7">{{item.num1}}</span></h4>
 										</a>
 										<ul class="mui-table-view mui-table-view-chevron">
-											<li class="mui-table-view-cell" v-for="(mod,index2) in item.list" :key="index2" >
+											<li class="mui-table-view-cell" v-for="(mod,index2) in item.list" :key="index2">
 												<a class="mui-navigate-right" @click="viewDetail(mod)" :class="{'mui-navigate-right': mod.upLoad}">
 													<div class="mui-pull-left flew-items">
-														<div class="mui-media-object flew"><img v-if="mod.faceImageUrl!=null" :src="mod.faceImageUrl + '?x-oss-process=image/resize,m_fill,w_64'" width="50" /></div>
-														<h4  v-html="mod.name"></h4>
+														<div class="mui-media-object flew"><img v-if="mod.faceImageUrl!=null" :src="mod.faceImageUrl + '?x-oss-process=image/resize,m_fill,w_64'"
+															 width="50" /></div>
+														<h4 v-html="mod.name"></h4>
 														<span class="mui-icon iconfont icon-erweima1  " :style="'color:'+getGreenCodeColor(mod.healthyCode)"></span>
 													</div>
 													<div class="mui-pull-right color55f868" v-if="mod.upLoad">已上报</div>
@@ -74,16 +75,16 @@
 				</div>
 			</div>
 		</div>
-	<loading :visible="isLoading"></loading>
+		<loading :visible="isLoading"></loading>
 
-</div>
+	</div>
 
 </template>
 
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
-	import * as API_ControlHealth from '@/apis/HouseKeeper/control/health'
+	import * as API_Health from '@/apis/Master/health'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
@@ -96,7 +97,7 @@
 		parseUnixTime
 	} from '$project/utils'
 	export default {
-		name: 'HouseKeeperControlHealthWorker',
+		name: 'MasterHealthWorker',
 		components: {
 			Common,
 			Loading,
@@ -274,7 +275,7 @@
 				});
 			},
 			pageList(status, index) {
-				return API_ControlHealth.workerPageList({
+				return API_Health.workerPageList({
 					setinput: this.setinput,
 					companyId: this.person_data.companyId,
 					queryDate: this.curDate,
@@ -322,14 +323,15 @@
 			//获取绿码统计数据
 			getHealthyCodeStat() {
 				this.isLoading = true;
-				API_ControlHealth.getHealthyCodeStat(this.person_data.companyId,'3').then(response => {
+				API_Health.getHealthyCodeStat(this.person_data.companyId, '3').then(response => {
 					this.isLoading = false;
 					this.statList = response;
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
 				})
-			},asynCallBack(){},
+			},
+			asynCallBack() {},
 		},
 		mounted() {
 			//获取列表
@@ -349,7 +351,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-                person_popedom: 'person_popedom',
+				person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/Master/Health/WorkerInfo.vue

@@ -0,0 +1,159 @@
+<template>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-qingjiadt">
+			<div class="mui-content-padded">
+				<h5>个人信息</h5>
+			</div>
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>姓名</label>
+					<span v-html="detail.name">王后雄</span>
+				</div>
+				<div class="mui-input-row">
+					<label>手机号</label>
+					<span v-html="detail.phone"> </span>
+				</div>
+				<div class="mui-input-row">
+					<label>公司名称</label>
+					<span v-html="detail.companyName"></span>
+				</div>
+				<div class="mui-input-row">
+					<label>工号</label>
+					<span> </span>
+				</div>
+
+				<div class="mui-input-row">
+					<label>岗位</label>
+					<span> </span>
+				</div>
+
+			</form>
+			<div class="mui-content-padded">
+				<h5>健康状态</h5>
+			</div>
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label style="width:50%">自身健康情况</label>
+					<span v-html="detail.personHealthLedger.healthStatusN"> </span>
+				</div>
+				<div class="mui-input-row">
+					<label>今日体温</label>
+					<span v-html="detail.personHealthLedger.temperature+'°C'">36.3</span>
+				</div>
+				<div class="mui-input-row">
+					<label>其他情况</label>
+					<!--						<span>无</span>-->
+					<textarea class="mui-input-textarea" readonly v-html="detail.personHealthLedger.healthRemark"></textarea>
+
+				</div>
+				<div class="mui-input-row">
+					<label style="width:70%">家庭成员身体健康情况</label>
+					<span v-html="detail.personHealthLedger.familyStatusN">健康</span>
+				</div>
+				<div class="mui-input-row">
+					<label style="width:50%">家庭成员健康码</label>
+					<span class="vongi-yddk-dat-photo">
+						<div class="flew">
+							<div class="mui-col-xs-3" v-for="(code,index) in detail.personHealthLedger.familyGreenCode.split(',')">
+								<img :src="code+ '?x-oss-process=image/resize,m_fill,w_128,h_128'" width="100%" />
+							</div>
+						</div>
+					</span>
+				</div>
+				<div class="mui-input-row">
+					<label style="width:70%" v-html="detail.personHealthLedger.isGoto?'是':'否'">假期是否曾前往重点疫区</label>
+					<span>否</span>
+				</div>
+				<div class="mui-input-row">
+					<label style="width:70%" v-html="detail.personHealthLedger.isTouch?'是':'否'">是否接触重点疫区高危人群</label>
+					<span>否</span>
+				</div>
+			</form>
+
+		</div>
+		<loading :visible="isLoading"></loading>
+
+	</div>
+</template>
+
+
+<script>
+	import * as API_Health from '@/apis/Master/health'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import {
+		currentTimeStamp,
+		parseUnixTime
+	} from '$project/utils'
+	export default {
+		name: 'MasterHealthWorkerInfo',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '职工台账详情',
+
+				id: '',
+				detail: {
+					personHealthLedger: {
+						healthStatusN: null,
+						familyGreenCode: ""
+					}
+				},
+				isLoading: false,
+			}
+		},
+		created() {
+			this.id = this.$route.query.id;
+		},
+		methods: {
+			//获取详情
+			getDetail() {
+				this.isLoading = true;
+
+				API_Health.getDetail(this.id, '3').then(response => {
+					this.isLoading = false;
+
+					this.detail = response;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			asynCallBack() {},
+		},
+		mounted() {
+			this.getDetail();
+
+		},
+
+
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>

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

@@ -32,7 +32,7 @@
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
+	import * as API_Health from '@/apis/Master/health'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
@@ -46,7 +46,7 @@
 		parseUnixTime
 	} from '$project/utils'
 	export default {
-		name: 'HouseKeeperControlHealthWorkerTemperature',
+		name: 'MasterHealthWorkerTemperature',
 		components: {
 			Common,
 			Loading,
@@ -64,7 +64,7 @@
 					style: 'font-size:14px;color:#000;',
 					title: '未测人员'
 				},
-				companyName:'',
+				companyName: '',
 				listForm: {
 					pageIndex: 1,
 					pageSize: 20,
@@ -78,13 +78,13 @@
 		},
 		created() {
 			//赋值当前公司
-			if(this.$route.query.companyId){
+			if (this.$route.query.companyId) {
 				this.listForm.companyId = this.$route.query.companyId;
-				this.companyName=unescape(this.$route.query.companyName);
+				this.companyName = unescape(this.$route.query.companyName);
 
-			}else{
+			} else {
 				this.listForm.companyId = this.person_data.companyId;
-				this.companyName=this.person_data.companyName;
+				this.companyName = this.person_data.companyName;
 			}
 
 			if (this.$route.query.queryDate) {
@@ -97,7 +97,7 @@
 			//获取列表
 			getList() {
 				this.isLoading = true;
-				API_Admin.getTemperatureList(this.listForm).then(response => {
+				API_Health.getTemperatureList(this.listForm).then(response => {
 					if (response) {
 						if (this.listForm.pageIndex == 1) {
 							this.recordList = response.data;
@@ -149,7 +149,7 @@
 				this.$router.push({
 					name: 'HouseKeeperControlHealthNoTemperatureRecord',
 					query: {
-						companyId:	this.listForm.companyId,
+						companyId: this.listForm.companyId,
 
 					}
 				})
@@ -174,7 +174,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-                person_popedom: 'person_popedom',
+				person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Person/Add.vue → src/projects/business/views/Master/Person/Add.vue

@@ -56,7 +56,7 @@
 	import * as types from '$project/store/mutation-types'
 	import Cropper from '$project/components/Cropper.vue'
 	export default {
-		name: 'HouseKeeperAdminPersonAdd',
+		name: 'MasterPersonAdd',
 		components: {
 			Common,
 			Loading,
@@ -166,7 +166,7 @@
 				if (this.checkFrom()) {
 					this.set_add_person_data(this.subForm);
 					this.$router.push({
-						name: 'HouseKeeperAdminPersonDevice',
+						name: 'MasterPersonSelectDevice',
 						query: {}
 					})
 				}

src/projects/business/views/HouseKeeper/Admin/Person/Device.vue → src/projects/business/views/Master/Person/SelectDevice.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-	import * as API_Admin from '@/apis/HouseKeeper/admin'
+	import * as API_Person from '@/apis/Master/person'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
@@ -36,7 +36,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'CommonNoticeInfo',
+		name: 'MasterPersonSelectDevice',
 		components: {
 			Common,
 			Loading,
@@ -66,7 +66,7 @@
 			}
 			if (!this.subForm.name || !this.subForm.phone || !this.subForm.faceImageUrl) {
 				this.$router.push({
-					name: 'HouseKeeperAdminPersonAdd',
+					name: 'MasterPersonAdd',
 					query: {}
 				})
 			}
@@ -75,7 +75,7 @@
 			//获取设备列表
 			getList() {
 				this.isLoading = true;
-				API_Admin.getDeviceList().then(response => {
+				API_Person.getDeviceList().then(response => {
 					this.isLoading = false;
 					this.recordList = response;
 				}).catch(error => {
@@ -98,7 +98,7 @@
 
 				if (this.checkForm()) {
 					this.isLoading = true;
-					API_Admin.addPerson(this.subForm).then(response => {
+					API_Person.addPerson(this.subForm).then(response => {
 						this.isLoading = false;
 						this.successVisible = true;
 					}).catch(error => {
@@ -110,7 +110,7 @@
 			//成功后的点击
 			successTo() {
 				this.$router.push({
-					name: 'HouseKeeperAdmin',
+					name: 'Master',
 					query: {}
 				})
 			},