|
@@ -4,7 +4,7 @@ |
|
|
<view class="rules"> |
|
|
<view class="rules"> |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
上课 {{info.WorkTime}} |
|
|
|
|
|
|
|
|
上课 {{info.StartTime}} |
|
|
</view> |
|
|
</view> |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
{{info.UserWorkTime?info.UserWorkTime.split(' ')[1]+' 打卡':'未打卡'}} |
|
|
{{info.UserWorkTime?info.UserWorkTime.split(' ')[1]+' 打卡':'未打卡'}} |
|
@@ -12,7 +12,7 @@ |
|
|
</view> |
|
|
</view> |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
下课 {{info.CloseTime}} |
|
|
|
|
|
|
|
|
下课 {{info.EndTime}} |
|
|
</view> |
|
|
</view> |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
{{info.UserCloseTime?info.UserCloseTime.split(' ')[1]+' 打卡':'未打卡'}} |
|
|
{{info.UserCloseTime?info.UserCloseTime.split(' ')[1]+' 打卡':'未打卡'}} |
|
@@ -30,6 +30,12 @@ |
|
|
<text>{{postData.AIsOut== 1 ? ' | ' + info.AttendanceTypeString:''}}</text> |
|
|
<text>{{postData.AIsOut== 1 ? ' | ' + info.AttendanceTypeString:''}}</text> |
|
|
<view style="color: #666;"> |
|
|
<view style="color: #666;"> |
|
|
{{postData.ClockPlace}} |
|
|
{{postData.ClockPlace}} |
|
|
|
|
|
<view class=""> |
|
|
|
|
|
{{info.LessonSortNo == 1?'必修:':info.LessonSortNo == 2?'选修:':''}} {{info.LessonName}} |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class=""> |
|
|
|
|
|
教师:{{info.EmpName}} |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
@@ -143,6 +149,11 @@ |
|
|
} |
|
|
} |
|
|
this.info = success.data |
|
|
this.info = success.data |
|
|
this.imgsrc = dk; |
|
|
this.imgsrc = dk; |
|
|
|
|
|
this.postData = { |
|
|
|
|
|
LessonSortNo:this.info.LessonSortNo, |
|
|
|
|
|
ALTId:this.info.ALTId||undefined, |
|
|
|
|
|
ALTOEId:this.info.ALTOEId||undefined |
|
|
|
|
|
} |
|
|
// if ([1].includes(this.info.AttendanceType)) { |
|
|
// if ([1].includes(this.info.AttendanceType)) { |
|
|
// this.imgsrc=dk; |
|
|
// this.imgsrc=dk; |
|
|
// } else if ([2,3].includes(this.info.AttendanceType)) { |
|
|
// } else if ([2,3].includes(this.info.AttendanceType)) { |
|
@@ -220,7 +231,7 @@ |
|
|
} |
|
|
} |
|
|
let distance = this.map.getDistance(myP1, myP2).toFixed(2) |
|
|
let distance = this.map.getDistance(myP1, myP2).toFixed(2) |
|
|
// alert('距离'+ distance) |
|
|
// alert('距离'+ distance) |
|
|
// console.log('距离', distance, '打卡坐标:', myP1, '当前坐标:', myP2) |
|
|
|
|
|
|
|
|
console.log('距离', distance, '打卡坐标:', myP1, '当前坐标:', myP2) |
|
|
if (Number(distance) > Number(this.info.GPSRange)) { |
|
|
if (Number(distance) > Number(this.info.GPSRange)) { |
|
|
this.$set(this.info, 'AttendanceType', 4) |
|
|
this.$set(this.info, 'AttendanceType', 4) |
|
|
this.$set(this.info, 'AttendanceTypeString', '外勤打卡') |
|
|
this.$set(this.info, 'AttendanceTypeString', '外勤打卡') |
|
@@ -235,9 +246,13 @@ |
|
|
local() { |
|
|
local() { |
|
|
return new Promise(async (resolve) => { |
|
|
return new Promise(async (resolve) => { |
|
|
// let res = await this.getLocation() |
|
|
// let res = await this.getLocation() |
|
|
|
|
|
// let res = { |
|
|
|
|
|
// lng: 112.57205562051, |
|
|
|
|
|
// lat: 37.742374280962 |
|
|
|
|
|
// } |
|
|
let res = { |
|
|
let res = { |
|
|
lng: 112.57205562051, |
|
|
|
|
|
lat: 37.742374280962 |
|
|
|
|
|
|
|
|
lng: 112.55981419, |
|
|
|
|
|
lat: 37.80890166 |
|
|
} |
|
|
} |
|
|
if (!res) { |
|
|
if (!res) { |
|
|
this.$set(this.postData, 'ALon', '') |
|
|
this.$set(this.postData, 'ALon', '') |
|
|