diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue index 9b1540046..c056f243e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue @@ -4,7 +4,7 @@ - 上课 {{info.WorkTime}} + 上课 {{info.StartTime}} {{info.UserWorkTime?info.UserWorkTime.split(' ')[1]+' 打卡':'未打卡'}} @@ -12,7 +12,7 @@ - 下课 {{info.CloseTime}} + 下课 {{info.EndTime}} {{info.UserCloseTime?info.UserCloseTime.split(' ')[1]+' 打卡':'未打卡'}} @@ -30,6 +30,12 @@ {{postData.AIsOut== 1 ? ' | ' + info.AttendanceTypeString:''}} {{postData.ClockPlace}} + + {{info.LessonSortNo == 1?'必修:':info.LessonSortNo == 2?'选修:':''}} {{info.LessonName}} + + + 教师:{{info.EmpName}} + @@ -143,6 +149,11 @@ } this.info = success.data 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)) { // this.imgsrc=dk; // } else if ([2,3].includes(this.info.AttendanceType)) { @@ -220,7 +231,7 @@ } let distance = this.map.getDistance(myP1, myP2).toFixed(2) // alert('距离'+ distance) - // console.log('距离', distance, '打卡坐标:', myP1, '当前坐标:', myP2) + console.log('距离', distance, '打卡坐标:', myP1, '当前坐标:', myP2) if (Number(distance) > Number(this.info.GPSRange)) { this.$set(this.info, 'AttendanceType', 4) this.$set(this.info, 'AttendanceTypeString', '外勤打卡') @@ -235,9 +246,13 @@ local() { return new Promise(async (resolve) => { // let res = await this.getLocation() + // let res = { + // lng: 112.57205562051, + // lat: 37.742374280962 + // } let res = { - lng: 112.57205562051, - lat: 37.742374280962 + lng: 112.55981419, + lat: 37.80890166 } if (!res) { this.$set(this.postData, 'ALon', '')