上下班时间调用接口

pagesClockin/index.vue

@@ -15,7 +15,7 @@
 			<div class="c_title">今日打卡</div>
 			<div class="c_worktime">
 				<div class="cw_pre">
-					<p>上班08:30</p>
+					<p>上班{{workingTime||'08:30'}}</p>
 					<div class="cwp_time">
 						<image :src="imgBase+'clockingin/checked_active.png'" v-if="sbClockTime"></image>
 						<image :src="imgBase+'clockingin/checked_inactive.png'" v-else></image>
@@ -24,7 +24,7 @@
 					<div class="cwp_status" :class="{'active':sbClockTime,'inactive':!sbClockTime}">{{sbClockTime?'已打卡':'未打卡'}}</div>
 				</div>
 				<div class="cw_pre">
-					<p>下班20:00</p>
+					<p>下班{{offWorkTime||'15:30'}}</p>
 					<div class="cwp_time">
 						<image :src="imgBase+'clockingin/checked_active.png'" v-if="xbClockTime"></image>
 						<image :src="imgBase+'clockingin/checked_inactive.png'" v-else></image>
@@ -74,6 +74,8 @@
 			return {
 				username:'',
 				dateweek:'',
+				workingTime:'',
+				offWorkTime:'',
 				sbClockTime:'',
 				xbClockTime:'',
 				isSW:true,//是否是上午，12点前是上午/12点前上午打过卡就是下午了，12点后是下午
@@ -102,10 +104,18 @@
 			clearInterval(timer)
 		},
 		mounted() {
+			this.getRules();
 			this.getCurrentLocation();
 			this.getUserInfo();
 		},
 		methods:{
+			getRules(){
+				this.$api.get('/wms/outsourced/attendance/rule').then(res=>{
+					if(res.data.code!==0) return this.$showToast(res.data.msg)
+					this.workingTime = res.data.data.workingTime.slice(0,5);
+					this.offWorkTime = res.data.data.offWorkTime.slice(0,5);
+				})
+			},
 			getUserInfo(){
 				this.$api.get('/wms/outsourced/attendance/getAttendanceByUserId/'+this.userInfo?.id).then(res=>{
 					if(res.data.code!==0) return this.$showToast(res.data.msg)

pagesStatistics/components/CusCalendar/index.vue

@@ -6,7 +6,10 @@
 		<div class="date">
 			<div class="d_pre" v-for="(pre,idx) in calendarList" :key="idx" @tap="selectDay(pre,idx)">
 				<div class="day" :class="{'dq':pre.iscurrentday,'select':pre.select,'wd':pre.isweekday}">{{pre.day}}</div>
-				<div class="status" :class="{'zc':pre.status===0,'yc':pre.status===1}" v-if="pre.status<2"></div>
+				<div class="status_boxs">
+					<div class="status zc" v-if="pre.status<2"></div>
+					<div class="status yc" v-if="pre.status===1" style="margin-left: 10rpx;"></div>
+				</div>
 			</div>
 		</div>
 	</view>
@@ -51,7 +54,7 @@
 					this.$set(this.calendarList[i],'select',false);
 					let t = this.clockList.find(l=>l.attendanceDate==c.nyr);
 					if(t&&c.month==month){
-						this.$set(this.calendarList[i],'status',t?.isLeave===0?0:1);
+						this.$set(this.calendarList[i],'status',t.isLeave===null?2:(t.isLeave===0?0:1));
 						this.$set(this.calendarList[i],'id',t?.id);
 					} 
 					else this.$set(this.calendarList[i],'status',2);
@@ -177,6 +180,10 @@
 						background: #2E69EB;
 					}
 				}
+				.status_boxs{
+					display: flex;
+					align-items: center;
+				}
 				.status{
 					width: 10rpx;
 					height: 10rpx;

pagesStatistics/index.vue

@@ -23,7 +23,7 @@
 			<div class="c_calendar">
 				<Calendar ref="calendarRef" @selectDay="selectDay" @selectInfo="selectInfo"></Calendar>
 			</div>
-			<div class="c_tip" v-if="info.iswd">当日班次：{{'固定上下班'}} 班次 {{'08:30-17:30'}}</div>
+			<div class="c_tip" v-if="info.iswd">当日班次：{{'固定上下班'}} 班次 {{workingTime||'08:30'}}-{{offWorkTime||'17:30'}}</div>
 			<div class="c_tip" v-else>当日班次：休息</div>
 			<div class="c_tip">出勤统计：打卡{{info.clockTimes||0}}次，工时{{info.workHours||0}}小时</div>
 			<div class="c_time" v-if="info&&info.status==1">
@@ -64,6 +64,8 @@
 		components:{ Calendar,Tabbar },
 		data(){
 			return {
+				workingTime:'',
+				offWorkTime:'',
 				currentDay:'',
 				currentTime:'',
 				clockDays:'',
@@ -87,11 +89,19 @@
 			this.getUserMonthClock(new Date().getFullYear(),new Date().getMonth()+1);
 		},
 		mounted() {
+			this.getRules();
 			let d = new Date();
 			this.minDate = new Date(d.getFullYear()-1,d.getMonth()+1,d.getDate()).getTime();
 			this.maxDate = new Date().getTime();	
 		},
 		methods:{
+			getRules(){
+				this.$api.get('/wms/outsourced/attendance/rule').then(res=>{
+					if(res.data.code!==0) return this.$showToast(res.data.msg)
+					this.workingTime = res.data.data.workingTime.slice(0,5);
+					this.offWorkTime = res.data.data.offWorkTime.slice(0,5);
+				})
+			},
 			getUserMonthClock(year,month){
 				this.$api.get('/wms/outsourced/attendance/listByUserId',{
 					outUserId:this.userInfo.id,

utils/coordtransform.js

@@ -13,7 +13,6 @@ function outOfChina(lng, lat) {
 
 // WGS-84 转 GCJ-02
 export function wgs84togcj02(lng, lat) {
-	console.log(lng, lat);
   if (outOfChina(lng, lat)) return [lng, lat];
 
   let dlat = transformlat(lng - 105.0, lat - 35.0);