Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

src/projects/business/router/houseKeeper.js

@@ -312,7 +312,60 @@ const routesHouseKeeper = [
 								}
 							},
 						],
-					}
+					},
+
+					//考勤
+					{
+						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: '考勤记录异地打卡详情',
+								}
+							},
+						]
+					},
+
 				]
 			},
 

src/projects/business/views/Common/Health/Cert.vue

@@ -145,7 +145,9 @@
 						this.maxTemparture = response[0]['temperatureMax'];
 						this.detail.totalDays = response[0]['totalDays'];
 						this.detail.undetectedCount = response[0]['undetectedCount'];
-						this.getStatus()
+						//this.getStatus()
+						//只根据绿码来判断状态
+						this.getGreenCode()
 						this.echarts();
 					}
 
@@ -155,6 +157,14 @@
 					mui.toast(error);
 				})
 			},
+			//根据绿码显示颜色
+			getGreenCode() {
+				var colors = this.$refs.greenCode.getCode();
+				this.statusColor = colors.foreground;
+				this.statusTitleColor = colors.foreground;
+				this.statusName = colors.title;
+				console.log(colors);
+			},
 			//计算显示颜色
 			getStatus() {
 				if (this.chartsList.length) {

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

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

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

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

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

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

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

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

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

@@ -148,7 +148,13 @@
 
 			},
 		},
-		mounted() {},
+		mounted() {
+			var gallery = mui('.mui-slider');
+			var slider = gallery.slider({
+				interval: 2000, //自动轮播周期，若为0则不自动播放，默认为0；
+				bounce: true //是否启用回弹
+			});
+		},
 		destroyed() {
 
 		},

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

@@ -21,6 +21,7 @@
 			</div>
 		</div>
 
+		<loading :visible="isLoading"></loading>
 	</div>
 </template>
 

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

@@ -217,8 +217,10 @@
 				this.isLoading = true;
 				WxJsApi.getLocation().then((res) => {
 					this.isLoading = false;
-					this.tjForm.latitude = res.latitude;
-					this.tjForm.longitude = res.longitude;
+					this.tjForm.latitude = parseFloat(res.latitude);
+					this.tjForm.longitude = parseFloat(res.longitude);
+					
+					console.log(this.tjForm)
 
 					//获取定位地址
 					this.getPositionByLonLats()

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

@@ -7,7 +7,7 @@
 			<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 @click="reloadList(0)" :class="'mui-control-item '+(listForm.status==0?'':'mui-active')">
+						<a @click="reloadList(0)" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
 							<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
 						</a>
 						<a @click="reloadList(3)" :class="'mui-control-item '+(listForm.status==3?'mui-active':'')">
@@ -31,18 +31,18 @@
 										</router-link>
 										<input name="checkbox" v-model="selectIdList" :value="item.id" type="checkbox">
 									</div>
-								</form>								
+								</form>
 							</div>
 							<div class="fyy-bindfyy-btn">
-									<form class="mui-input-group">
-										<div class="mui-input-row mui-checkbox mui-left">
-											<label>全选</label>
-											<input v-model="allSelect" value="1" type="checkbox" @click="selectAll" :checked="recordList.length==selectIdList.length">
-										</div>
-									</form>
-									<button type="button" class="mui-btn mui-btn-danger" @click="openFrom('2')">拒绝</button>
-									<button type="button" class="mui-btn mui-btn-success" @click="openFrom('1')">同意</button>
-								</div>
+								<form class="mui-input-group">
+									<div class="mui-input-row mui-checkbox mui-left">
+										<label>全选</label>
+										<input v-model="allSelect" value="1" type="checkbox" @click="selectAll" :checked="recordList.length==selectIdList.length">
+									</div>
+								</form>
+								<button type="button" class="mui-btn mui-btn-danger" @click="openFrom('2')">拒绝</button>
+								<button type="button" class="mui-btn mui-btn-success" @click="openFrom('1')">同意</button>
+							</div>
 						</div>
 					</div>
 
@@ -84,6 +84,7 @@
 			</div>
 		</div>
 
+		<loading :visible="isLoading"></loading>
 	</div>
 </template>
 

src/projects/business/views/Master/Home.vue

@@ -214,7 +214,13 @@
 
 			},
 		},
-		mounted() {},
+		mounted() {
+			var gallery = mui('.mui-slider');
+			var slider = gallery.slider({
+				interval: 2000, //自动轮播周期，若为0则不自动播放，默认为0；
+				bounce: true //是否启用回弹
+			});
+		},
 		destroyed() {
 
 		},

src/utils/wxJsApi.js

@@ -79,7 +79,7 @@ export function getLocation() {
 			wx.getLocation({
 				type: 'gcj02', // 默认为wgs84的gps坐标，可传入'gcj02'
 				success: function(res) {
-					resolve(response);
+					resolve(res);
 				},
 				faile: function(res) {
 					reject(res);