diff --git a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
index efae8ce..b35c8a4 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
@@ -612,8 +612,10 @@ function getTodayTrack(day) {
clearFn();
let data = {
devSn: queryInfo.value.devSn,
- createTime_begin: day,
- createTime_end: day
+ // createTime_begin: day,
+ // createTime_end: day
+ uploadTime_begin: day,
+ uploadTime_end: day
};
getEpRealtimeDataApi(data).then((res: any) => {
let path = [];
@@ -1103,11 +1105,11 @@ function trackMapInit(path: any, item: any) {
console.log(e);
let info = [];
- // info.push('
设备序号1: ' + item.devSn + "
");
- // info.push('设备名称: ' + item.equipmentName + "
");
+
info.push('设备序号: ' + item.devSn + "
");
info.push('人员名称: ' + item.equipmentName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
+ // info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('最后更新时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
var infoWindow = new AMap.InfoWindow({
@@ -1443,7 +1445,8 @@ function echoCarMarker(item) {
// info.push('设备名称: ' + item.equipmentName + "
");
info.push('设备序号: ' + item.devSn + "
");
info.push('人员名称: ' + item.equipmentName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
+ // info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('最后更新时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
@@ -1501,7 +1504,8 @@ function echoPersonMarker(item) {
// info.push('设备名称: ' + item.equipmentName + "
");
info.push('设备序号: ' + item.devSn + "
");
info.push('人员名称: ' + item.equipmentName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
+ // info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('最后更新时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index 249d8b3..4ce5077 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -910,8 +910,10 @@ function getTodayTrack(day) {
clearFn();
let data = {
devSn: queryInfo.value.devSn,
- createTime_begin: day,
- createTime_end: day
+ // createTime_begin: day,
+ // createTime_end: day
+ uploadTime_begin: day,
+ uploadTime_end: day
};
getRealtimeDataApi(data).then((res: any) => {
@@ -1445,7 +1447,8 @@ function trackMapInit(path: any, item: any) {
info.push('设备序号: ' + item.devSn + "
");
info.push('人员名称: ' + item.workerName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
+ // info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('最后上传时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
@@ -1802,7 +1805,8 @@ function echoCarMarker(item) {
info.push('设备序号: ' + item.devSn + "
");
info.push('人员名称: ' + item.workerName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
+ // info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('最后上传时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
@@ -1861,7 +1865,8 @@ function echoPersonMarker(item) {
info.push('设备序号: ' + item.devSn + "
");
info.push('人员名称: ' + item.workerName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
+ // info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('最后上传时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
var infoWindow = new AMap.InfoWindow({