Explorar o código

地址及加载图

wgl %!s(int64=4) %!d(string=hai) anos
pai
achega
802de5506b

BIN=BIN
src/assets/img/xxd_loading.gif


+ 1 - 1
src/projects/business/views/HouseKeeper/Admin/Attendance/OutsideInfo.vue

@@ -41,7 +41,7 @@
 					</li>
 					<li class="mui-table-view-cell mui-media">
 						<div class="mui-media-body">打卡位置</div>
-						<span>湖北省荆州市沙市区北京东路133号沙市花园</span>
+						<span v-text="detail.address"></span>
 					</li>
 					<li class="mui-table-view-cell mui-media">
 						<div class="mui-media-body">相关照片</div>

+ 4 - 0
src/projects/business/views/Master/Attendance/Info.vue

@@ -31,6 +31,10 @@
 						<div class="mui-media-body">申请班次</div>
 						<span class="colorf6f448" v-text="detail.fillAttendanceDayAndTime"></span>
 					</li>
+					<li v-if="detail.address" class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">打卡地点</div>
+						<span v-text="detail.address"></span>
+					</li>
 					<li class="mui-table-view-cell mui-media">
 						<div class="mui-media-body">申请时间</div>
 						<span v-text="detail.createTime"></span>

+ 6 - 6
src/projects/business/views/Master/Attendance/Sign.vue

@@ -20,7 +20,7 @@
 			</div>
 			<div class="mui-content-padded">
 				<h5><span class="colorfe616c">*</span>定位</h5>
-				<button class="vongi-yidi-location">{{positionName}}<span class="mui-icon mui-icon-location"></span></button>
+				<button class="vongi-yidi-location">{{tjForm.address}}<span class="mui-icon mui-icon-location"></span></button>
 			</div>
 			<div class="mui-content-padded">
 				<h5>备注</h5>
@@ -85,14 +85,14 @@
 					approvalPersonId: '',
 					workAttendanceId: '',
 					photoFile: '',
-					longitude: 112.198305,
-					latitude: 30.347599,
+					longitude: 112.276527,
+					latitude: 30.306427,
+					address: '',
 				},
 				//typeName: '',
 				approvalPersonName: '',
 				personList: [],
 				picList: [],
-				positionName: '',
 			}
 		},
 		created() {
@@ -235,9 +235,9 @@
 							if (status === 'complete' && result.info === 'OK') {
 								var address = result.regeocode.formattedAddress;
 								console.log(address);
-								_this.positionName = address;
+								_this.tjForm.address = address;
 							} else {
-								_this.positionName = '无法获取定位';
+								_this.tjForm.address = '无法获取定位';
 							}
 						});
 					});