diff --git a/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
index 7644d97..49db2e1 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
@@ -957,7 +957,21 @@ function trackMapInit(path: any, item: any) {
map.setFitView();
}
function startAnimation() {
- marker.moveAlong(lineArr, 200);
+ let newArr = [];
+ for (let i = 0; i < lineArr.length; i++) {
+ if (i > 0) {
+ if (i + 1 != lineArr.length) {
+ if (lineArr[i][0] != lineArr[i + 1][0] && lineArr[i][1] != lineArr[i + 1][1]) {
+ newArr.push(lineArr[i]);
+ }
+ } else {
+ newArr.push(lineArr[i]);
+ }
+ }
+ }
+ marker.moveAlong(lineArr, {
+ duration: 500
+ });
}
// 围栏定位地图
diff --git a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
index 2bcedc2..5a41c1c 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
@@ -1103,13 +1103,15 @@ function trackMapInit(path: any, item: any) {
console.log(e);
let info = [];
- info.push('设备序号: ' + item.devSn + "
");
- info.push('设备名称: ' + item.equipmentName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
- info.push('位置: ' + address + "
");
- info.push('经纬度: ' + item.longitude + "|" + item.latitude + "
");
+ // info.push('设备序号1: ' + item.devSn + "
");
+ // info.push('设备名称: ' + item.equipmentName + "
");
+ info.push('设备序号: ' + item.devSn + "
");
+ info.push('人员名称: ' + item.equipmentName + "
");
+ info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
+ info.push('位置: ' + address + "
");
var infoWindow = new AMap.InfoWindow({
- offset: new AMap.Pixel(10, -30),
+ offset: new AMap.Pixel(-10, -20),
content: info.join("") //使用默认信息窗体框样式，显示信息内容
});
infoWindow.open(map, e.target.getPosition());
@@ -1117,7 +1119,21 @@ function trackMapInit(path: any, item: any) {
}
}
function startAnimation() {
- marker.moveAlong(lineArr, 200);
+ let newArr = [];
+ for (let i = 0; i < lineArr.length; i++) {
+ if (i > 0) {
+ if (i + 1 != lineArr.length) {
+ if (lineArr[i][0] != lineArr[i + 1][0] && lineArr[i][1] != lineArr[i + 1][1]) {
+ newArr.push(lineArr[i]);
+ }
+ } else {
+ newArr.push(lineArr[i]);
+ }
+ }
+ }
+ marker.moveAlong(lineArr, {
+ duration: 500
+ });
}
// 围栏定位地图
@@ -1422,14 +1438,16 @@ function echoCarMarker(item) {
// console.log(e)
let info = [];
- info.push('设备序号: ' + item.devSn + "
");
- info.push('设备名称: ' + item.equipmentName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
- info.push('位置: ' + address + "
");
- info.push('经纬度: ' + item.longitude + "|" + item.latitude + "
");
+ // info.push('设备序号1: ' + item.devSn + "
");
+ // info.push('设备名称: ' + item.equipmentName + "
");
+ info.push('设备序号: ' + item.devSn + "
");
+ info.push('人员名称: ' + item.equipmentName + "
");
+ info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
+ info.push('位置: ' + address + "
");
let infoWindow = new AMap.InfoWindow({
- offset: new AMap.Pixel(40, -30),
+ offset: new AMap.Pixel(15, -10),
content: info.join("") //使用默认信息窗体框样式，显示信息内容
});
// console.log("信息窗体",infoWindow)
@@ -1478,14 +1496,16 @@ function echoPersonMarker(item) {
console.log(e);
let info = [];
- info.push('设备序号: ' + item.devSn + "
");
- info.push('设备名称: ' + item.equipmentName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
- info.push('位置: ' + address + "
");
- info.push('经纬度: ' + item.longitude + "|" + item.latitude + "
");
+ // info.push('设备序号1: ' + item.devSn + "
");
+ // info.push('设备名称: ' + item.equipmentName + "
");
+ info.push('设备序号: ' + item.devSn + "
");
+ info.push('人员名称: ' + item.equipmentName + "
");
+ info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
+ info.push('位置: ' + address + "
");
var infoWindow = new AMap.InfoWindow({
- offset: new AMap.Pixel(10, -30),
+ offset: new AMap.Pixel(15, -10),
content: info.join("") //使用默认信息窗体框样式，显示信息内容
});
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index 2a6e189..6e18a3e 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -562,7 +562,7 @@ function openDetail(item) {
// });
let welanBox = document.getElementById('welanMaskContainer')
if(welanBox){
- welanBox.style.zIndex= '30'
+ welanBox.style.zIndex= '999'
}
workerListInFence.value = item.workerListInFence;
isOpenDetail.value = true;
@@ -1443,19 +1443,20 @@ function trackMapInit(path: any, item: any) {
// console.log(e);
let info = [];
- info.push('设备序号: ' + item.devSn + "
");
- info.push('人员名称: ' + item.workerName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
- info.push('位置: ' + address + "
");
- info.push('经纬度: ' + item.longitude + "|" + item.latitude + "
");
+ info.push('设备序号: ' + item.devSn + "
");
+ info.push('人员名称: ' + item.workerName + "
");
+ info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
+ info.push('位置: ' + address + "
");
+
var infoWindow = new AMap.InfoWindow({
- offset: new AMap.Pixel(30, -30),
+ offset: new AMap.Pixel(0, -30),
content: info.join("") //使用默认信息窗体框样式，显示信息内容
});
infoWindow.open(map, e.target.getPosition());
+ map.setFitView();
}
- map.setFitView();
}
function startAnimation() {
@@ -1797,11 +1798,12 @@ function echoCarMarker(item) {
// console.log(e)
let info = [];
- info.push('设备序号: ' + item.devSn + "
");
- info.push('车辆/人员名称: ' + item.numberPlate + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
- info.push('位置: ' + address + "
");
- info.push('经纬度: ' + item.longitude + "|" + item.latitude + "
");
+ info.push('设备序号: ' + item.devSn + "
");
+ info.push('人员名称: ' + item.workerName + "
");
+ info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
+ info.push('位置: ' + address + "
");
+
let infoWindow = new AMap.InfoWindow({
offset: new AMap.Pixel(30, -30),
@@ -1855,14 +1857,13 @@ function echoPersonMarker(item) {
console.log(e);
let info = [];
- info.push('设备序号: ' + item.devSn + "
");
- info.push('人员名称: ' + item.workerName + "
");
- info.push('最后更新时间: ' + item.updateTime + "
");
- info.push('位置: ' + address + "
");
- info.push('经纬度: ' + item.longitude + "|" + item.latitude + "
");
-
+ info.push('设备序号: ' + item.devSn + "
");
+ info.push('人员名称: ' + item.workerName + "
");
+ info.push('最后更新时间: ' + item.updateTime + "
");
+ info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
+ info.push('位置: ' + address + "
");
var infoWindow = new AMap.InfoWindow({
- offset: new AMap.Pixel(10, -30),
+ offset: new AMap.Pixel(15, -10),
content: info.join("") //使用默认信息窗体框样式，显示信息内容
// size: new AMap.Size(100,100)
});
@@ -1952,11 +1953,20 @@ function echoPersonMarker(item) {
overflow: hidden;
}
.welanMask {
- position: absolute;
- width: 100%;
- height: 100%;
- background: rgba(0, 0, 0, 0.5);
- z-index: -1;
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5); /* 半透明黑色背景 */
+ z-index: 9999; /* 确保遮罩层位于其他内容上方 */
+
+ // position: absolute;
+ // width: 99%;
+ // height: 120%;
+ // background: rgba(0, 0, 0, 0.9);
+ // z-index: -1;
+ // transform: transformY(-100%);
.weilanDetail {
position: absolute;
background: url("@/assets/images/aIEarlyWarning/dialogBg.png") no-repeat;
@@ -1965,7 +1975,7 @@ function echoPersonMarker(item) {
background-size: 100% 100%;
box-sizing: border-box;
width: 35%;
- // top: 25%;
+ top: 20%;
left: 32.5%;
height: 65%;
padding: 0 1%;