From 48159d28f55de95b1d280a13dbd0f14359f2e729 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 6 May 2025 16:41:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/synthesisQuery/digitalSignage.css | 15 +++++- .../static/img/digitalSignage/full-screen.png | Bin 0 -> 4295 bytes .../js/synthesisQuery/digitalSignage.js | 48 +++++++++++++----- .../pages/synthesisQuery/digitalSignage.html | 5 ++ 4 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/static/img/digitalSignage/full-screen.png diff --git a/src/main/resources/static/css/synthesisQuery/digitalSignage.css b/src/main/resources/static/css/synthesisQuery/digitalSignage.css index 3f10e17..c79f5a0 100644 --- a/src/main/resources/static/css/synthesisQuery/digitalSignage.css +++ b/src/main/resources/static/css/synthesisQuery/digitalSignage.css @@ -313,7 +313,7 @@ body { align-items: center; position: absolute; top: 15px; - right: 15px; + right: 60px; z-index: 999; } @@ -342,3 +342,16 @@ body { background-color: #8ea8e0; color: #fff; } + +.full-screen-btn { + position: absolute; + top: 15px; + right: 15px; + z-index: 999; + cursor: pointer; +} + +.full-screen-btn img { + width: 38px; + height: 38px; +} diff --git a/src/main/resources/static/img/digitalSignage/full-screen.png b/src/main/resources/static/img/digitalSignage/full-screen.png new file mode 100644 index 0000000000000000000000000000000000000000..b8896744473401457e59cf6cbe8558cd2df4e60d GIT binary patch literal 4295 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 U*hg<<^Z@7~7?^|Q`WJ8h4{_tV)Bpeg literal 0 HcmV?d00001 diff --git a/src/main/resources/static/js/synthesisQuery/digitalSignage.js b/src/main/resources/static/js/synthesisQuery/digitalSignage.js index 97151bd..8d7d82e 100644 --- a/src/main/resources/static/js/synthesisQuery/digitalSignage.js +++ b/src/main/resources/static/js/synthesisQuery/digitalSignage.js @@ -154,6 +154,11 @@ function getLocationInfo(id) { console.log(result, "获取位置信息---"); const { data } = result; + crossingList = []; + crossingListNew = []; + cablewayList = []; + towerList = []; + if (data.cablewaTransVos.length > 0) { cablewayList = data.cablewaTransVos; } else { @@ -204,6 +209,9 @@ function initMap() { // 以第一个点为中心初始化地图 map.centerAndZoom(new BMapGL.Point(intLng, intLat), 15); map.enableScrollWheelZoom(true); + + // 每次初始化的时候清除所有标点以及线 + map.clearOverlays(); var styleJson = [ // 隐藏道路 { @@ -294,7 +302,7 @@ function initMap() { // 添加标点 function addAllMapPoints() { // 清除地图上所有现有的标记 - map.clearOverlays(); + // map.clearOverlays(); // const bounds = []; const bounds = []; @@ -326,11 +334,11 @@ function addAllMapPoints() { // } // addedPoints[pointKey] = true; - // const point = new BMapGL.Point( - // pointData.baiduLon, - // pointData.baiduLat - // ); - const point = new BMapGL.Point(117.132663, 31.877325); + const point = new BMapGL.Point( + pointData.baiduLon, + pointData.baiduLat + ); + // const point = new BMapGL.Point(117.132663, 31.877325); bounds.push(point); // 检查图标是否存在，不存在则使用默认图标 @@ -920,17 +928,17 @@ function getScrollData(id) { let describeHtml = ""; if (item.spanType === "跨线路") { describeHtml += ` - 上层线路：${item.upperLine} - 下层线路: ${item.lowerLine} - 交叉角度: ${item.intersectionAngle} ° - 垂直距离: ${item.verticalDistance} m - 安全裕度: ${item.safetyMargin} ° + 上层线路：${item.upperLine || "/"} + 下层线路: ${item.lowerLine || "/"} + 交叉角度: ${item.intersectionAngle || "/"} + 垂直距离: ${item.verticalDistance || "/"} + 安全裕度: ${item.safetyMargin || "/"} `; } else { describeHtml += ` - 垂直净距：${item.verticalClearDistance} m - 杆塔间距: ${item.towerSpacing} m - 公路宽度: ${item.highwayWidth} m + 垂直净距：${item.verticalClearDistance || "/"} m + 杆塔间距: ${item.towerSpacing || "/"} m + 公路宽度: ${item.highwayWidth || "/"} m `; } @@ -1077,6 +1085,8 @@ document.addEventListener("DOMContentLoaded", function () { ) { setActiveNode(obj.elem); nodeId = obj.data.id; + intLng = obj.data.lon; + intLat = obj.data.lat; getScrollData(nodeId); getLegendData(nodeId); getLocationInfo(nodeId); @@ -1141,4 +1151,14 @@ document.addEventListener("DOMContentLoaded", function () { switchBtnItemMap.classList.remove("active"); isMap = false; }); + + // 点击全屏图标时 使地图盒子全屏 + const fullScreenBtn = document.querySelector(".full-screen-btn"); + fullScreenBtn.addEventListener("click", function () { + if (document.fullscreenElement) { + document.exitFullscreen(); + } else { + document.documentElement.requestFullscreen(); + } + }); }); diff --git a/src/main/resources/static/pages/synthesisQuery/digitalSignage.html b/src/main/resources/static/pages/synthesisQuery/digitalSignage.html index 3b3846d..084fc94 100644 --- a/src/main/resources/static/pages/synthesisQuery/digitalSignage.html +++ b/src/main/resources/static/pages/synthesisQuery/digitalSignage.html @@ -100,6 +100,11 @@ 混合 + + +
+ +