Merge remote-tracking branch 'origin/master'

src/apis/weixin.js

@@ -18,3 +18,15 @@ export function getDataByOpenId(params) {
 		method: 'post',
 	})
 }
+
+//获得配置
+export function getConfig() {
+	
+	return request({
+		url: '/wechat/getConfig'  ,
+		data: Qs.stringify({
+			url:escape(location.href.split('#')[0])
+		}),
+		method: 'post',
+	})
+}

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

@@ -0,0 +1,29 @@
+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/temperature.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+/**
+ * 测温记录
+ * @param params
+ */
+
+//
+export function pageList(params) {
+    return request({
+        url:  '/mobile/PersonDeviceFilterLog/pageList',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+//获取信息记录
+export function detail(params) {
+    return request({
+        url: '/mobile/PersonDeviceFilterLog/detail',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+
+
+

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

@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+/**
+ * 考勤相关
+ * @param params
+ */
+
+//
+export function pageList(params) {
+    return request({
+        url:  '/mobile/workAttendance/pageList',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+//提交
+export function postPatchCard(params) {
+    return request({
+        url: '/mobile/workAttendance/postPatchCard',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+
+//获取时间段
+export function patchCard(params) {
+    return request({
+        url: '/mobile/workAttendance/patchCard',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+
+

src/projects/business/router/master.js

@@ -351,7 +351,7 @@ const routesMaster = [
 						meta: {
 							requireAuth: false,
 							role: [],
-							title: '考勤详情',
+							title: '考勤补卡详情',
 						}
 					},
 					//考勤补卡申请