admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改安全帽和机械定位

Browse Source
This commit is contained in:
Vce 2024-03-30 11:36:37 +08:00
parent 5b782381e2
commit cd1e50a785
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
View File

@ -612,8 +612,10 @@ function getTodayTrack(day) {
clearFn(); clearFn();
let data = { let data = {
devSn: queryInfo.value.devSn, devSn: queryInfo.value.devSn,
createTime_begin: day, // createTime_begin: day,
createTime_end: day // createTime_end: day
uploadTime_begin: day,
uploadTime_end: day
}; };
getEpRealtimeDataApi(data).then((res: any) => { getEpRealtimeDataApi(data).then((res: any) => {
let path = []; let path = [];
@ -1103,11 +1105,11 @@ function trackMapInit(path: any, item: any) {
console.log(e); console.log(e);
let info = []; let info = [];
// info.push('<p style="padding: 0 10px;">设备序号1: ' + item.devSn + "</p>");
// info.push('<p style="padding: 0 10px;">设备名称: ' + item.equipmentName + "</p>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.equipmentName + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.equipmentName + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>"); // info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.uploadTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>");
var infoWindow = new AMap.InfoWindow({ var infoWindow = new AMap.InfoWindow({
@ -1443,7 +1445,8 @@ function echoCarMarker(item) {
// info.push('<p style="padding:7px;">设备名称: ' + item.equipmentName + "</p>"); // info.push('<p style="padding:7px;">设备名称: ' + item.equipmentName + "</p>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.equipmentName + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.equipmentName + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>"); // info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.uploadTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>");
@ -1501,7 +1504,8 @@ function echoPersonMarker(item) {
// info.push('<p style="padding:7px;">设备名称: ' + item.equipmentName + "</p>"); // info.push('<p style="padding:7px;">设备名称: ' + item.equipmentName + "</p>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.equipmentName + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.equipmentName + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>"); // info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.uploadTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>");

15
src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
View File

@ -910,8 +910,10 @@ function getTodayTrack(day) {
clearFn(); clearFn();
let data = { let data = {
devSn: queryInfo.value.devSn, devSn: queryInfo.value.devSn,
createTime_begin: day, // createTime_begin: day,
createTime_end: day // createTime_end: day
uploadTime_begin: day,
uploadTime_end: day
}; };
getRealtimeDataApi(data).then((res: any) => { getRealtimeDataApi(data).then((res: any) => {
@ -1445,7 +1447,8 @@ function trackMapInit(path: any, item: any) {
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.workerName + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.workerName + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>"); // info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后上传时间:</text> ' + item.uploadTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>");
@ -1802,7 +1805,8 @@ function echoCarMarker(item) {
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.workerName + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.workerName + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>"); // info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后上传时间:</text> ' + item.uploadTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>");
@ -1861,7 +1865,8 @@ function echoPersonMarker(item) {
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">设备序号:</text> ' + item.devSn + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.workerName + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">人员名称:</text> ' + item.workerName + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>"); // info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后更新时间:</text> ' + item.updateTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">最后上传时间:</text> ' + item.uploadTime + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">经纬度:</text> ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "</div>");
info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>"); info.push('<div style="padding:0 7px;"><text style="font-weight:bold">位置:</text> ' + address + "</div>");
var infoWindow = new AMap.InfoWindow({ var infoWindow = new AMap.InfoWindow({