diff --git a/src/main/resources/static/css/synthesisQuery/digitalSignage.css b/src/main/resources/static/css/synthesisQuery/digitalSignage.css index 7afd846..49589c6 100644 --- a/src/main/resources/static/css/synthesisQuery/digitalSignage.css +++ b/src/main/resources/static/css/synthesisQuery/digitalSignage.css @@ -211,7 +211,7 @@ body { position: absolute; bottom: 15px; left: 15px; - width: 320px; + width: 260px; padding: 10px; background: rgba(0, 0, 0, 0.6); border-radius: 10px; @@ -223,7 +223,7 @@ body { } .project-overview-preview-box { - width: 320px; + width: 260px; background: rgba(0, 0, 0, 0.6); position: absolute; /* 定位使预览盒子在工程概况的右边 */ @@ -231,7 +231,7 @@ body { right: -105%; z-index: 1000; display: none; - font-size: 12px; + font-size: 10px; color: #fff; border-radius: 10px; padding: 10px; @@ -251,7 +251,7 @@ body { .project-overview-title { padding-bottom: 10px 0; - font-size: 18px; + font-size: 14px; font-weight: bold; text-align: center; color: #fff; @@ -261,7 +261,7 @@ body { text-indent: 2em; /* max-height: 220px; */ color: #fff; - font-size: 12px; + font-size: 10px; letter-spacing: 1px; /* padding-bottom: 10px; */ /* 设置溢出隐藏显示... */ diff --git a/src/main/resources/static/js/synthesisQuery/digitalSignage.js b/src/main/resources/static/js/synthesisQuery/digitalSignage.js index b2f4ab3..a193048 100644 --- a/src/main/resources/static/js/synthesisQuery/digitalSignage.js +++ b/src/main/resources/static/js/synthesisQuery/digitalSignage.js @@ -359,10 +359,10 @@ function addAllMapPoints() { const iconUrl = iconTypeList[12]; // 默认使用第一个图标 const myIcon = new BMapGL.Icon( iconUrl, - new BMapGL.Size(24, 24), + new BMapGL.Size(14, 14), { - anchor: new BMapGL.Size(12, 24), // 修正锚点位置为中心底部 - imageSize: new BMapGL.Size(24, 24), // 与实际图片尺寸一致 + anchor: new BMapGL.Size(7, 14), // 修正锚点位置为中心底部 + imageSize: new BMapGL.Size(14, 14), // 与实际图片尺寸一致 } ); @@ -455,9 +455,9 @@ function addAllMapPoints() { const point = new BMapGL.Point(intLng, intLat); bounds.push(point); const iconUrl = iconTypeList[20]; - const myIcon = new BMapGL.Icon(iconUrl, new BMapGL.Size(24, 24), { - anchor: new BMapGL.Size(12, 12), // 修正锚点位置为中心底部 - imageSize: new BMapGL.Size(24, 24), // 与实际图片尺寸一致 + const myIcon = new BMapGL.Icon(iconUrl, new BMapGL.Size(14, 14), { + anchor: new BMapGL.Size(14, 14), // 修正锚点位置为中心底部 + imageSize: new BMapGL.Size(14, 14), // 与实际图片尺寸一致 }); const marker = new BMapGL.Marker(point, { icon: myIcon }); @@ -540,10 +540,10 @@ function addAllMapPoints() { // 1. 创建主标记点 const iconUrl = iconTypeList[parseInt(pointData.towerProgress)]; - let X = 24; - let Y = 24; - let anchorX = 12; - let anchorY = 24; + let X = 14; + let Y = 14; + let anchorX = 7; + let anchorY = 14; // if ([1, 2, 3, 4, 5, 6, 0].includes(pointData.towerProgress)) { // X = 14; // Y = 33.75; @@ -752,11 +752,11 @@ function addAllMapPoints() { }); // 4. 添加标签 - let offset = new BMapGL.Size(-20, -30); + let offset = new BMapGL.Size(-8, -18); if (index % 2 == 0) { - offset = new BMapGL.Size(-26, -60); + offset = new BMapGL.Size(-10, -28); } else { - offset = new BMapGL.Size(-26, 20); + offset = new BMapGL.Size(-10, 4); } const label = new BMapGL.Label(pointData.towerName, { position: point, @@ -766,12 +766,12 @@ function addAllMapPoints() { overlays.push(label); label.setStyle({ color: "#fff", - fontSize: "12px", + fontSize: "6px", backgroundColor: "rgba(0, 0, 0, 0.5)", border: "none", - padding: "0 10px", + padding: "0 1px", border: "1px solid #ccc", - boxShadow: "0 0 10px 0 rgba(0, 0, 0, 0.5)", + boxShadow: "0 0 2px 0 rgba(0, 0, 0, 0.5)", borderRadius: "4px", }); }); @@ -804,9 +804,9 @@ function addAllMapPoints() { // 检查图标是否存在,不存在则使用默认图标 const iconUrl = iconTypeList[21]; // 默认使用第一个图标 - const myIcon = new BMapGL.Icon(iconUrl, new BMapGL.Size(24, 24), { - anchor: new BMapGL.Size(12, 24), // 修正锚点位置为中心底部 - imageSize: new BMapGL.Size(24, 24), // 与实际图片尺寸一致 + const myIcon = new BMapGL.Icon(iconUrl, new BMapGL.Size(14, 14), { + anchor: new BMapGL.Size(7, 14), // 修正锚点位置为中心底部 + imageSize: new BMapGL.Size(14, 14), // 与实际图片尺寸一致 }); const marker = new BMapGL.Marker(point, { icon: myIcon });