From 9bc2e366d9dbf516f457f4f6d24944a419364387 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 11 Jun 2025 13:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=9C=8B=E6=9D=BF=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/synthesisQuery/digitalSignage.css | 80 +++++++++++- .../static/img/digitalSignage/line_red.png | Bin 0 -> 2180 bytes .../static/img/digitalSignage/line_yellow.png | Bin 0 -> 2180 bytes .../static/img/digitalSignage/qp.png | Bin 0 -> 5984 bytes .../js/synthesisQuery/digitalSignage.js | 118 ++++++++++++++++-- .../lineManagement/child/lineFormTemp.html | 8 +- .../pages/synthesisQuery/digitalSignage.html | 15 +++ 7 files changed, 206 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/static/img/digitalSignage/line_red.png create mode 100644 src/main/resources/static/img/digitalSignage/line_yellow.png create mode 100644 src/main/resources/static/img/digitalSignage/qp.png diff --git a/src/main/resources/static/css/synthesisQuery/digitalSignage.css b/src/main/resources/static/css/synthesisQuery/digitalSignage.css index 61e815a..642007c 100644 --- a/src/main/resources/static/css/synthesisQuery/digitalSignage.css +++ b/src/main/resources/static/css/synthesisQuery/digitalSignage.css @@ -45,7 +45,7 @@ body { .legend-box, .right-drawer-box { position: absolute; - background: rgba(0, 0, 0, 0.5); + background: rgba(0, 0, 0, 0.6); color: #fff; z-index: 999; } @@ -139,7 +139,7 @@ body { top: 15px; left: 15px; width: 140px; - height: 252px; + height: 280px; display: flex; flex-direction: column; justify-content: space-around; @@ -206,6 +206,75 @@ body { text-align: right; } +/* 左下角工程概况 */ +.project-overview-box { + position: absolute; + bottom: 15px; + left: 15px; + width: 320px; + padding: 10px; + background: rgba(0, 0, 0, 0.6); + border-radius: 10px; + z-index: 999; + + /* display: flex; + flex-direction: column; + justify-content: space-around; */ +} + +.project-overview-preview-box { + width: 320px; + background: rgba(0, 0, 0, 0.6); + position: absolute; + /* 定位使预览盒子在工程概况的右边 */ + top: -85%; + right: -105%; + z-index: 1000; + display: none; + font-size: 12px; + color: #fff; + border-radius: 10px; + padding: 10px; + text-indent: 2em; +} + +.project-overview-preview-box-arrow { + width: 20px; + height: 20px; + position: absolute; + bottom: 0; + left: -20px; + z-index: 1001; + background: url("../../img/digitalSignage/qp.png") no-repeat center center; + background-size: 100% 100%; +} + +.project-overview-title { + padding-bottom: 10px 0; + font-size: 18px; + font-weight: bold; + text-align: center; + color: #fff; +} + +.project-overview-content { + text-indent: 2em; + /* max-height: 220px; */ + color: #fff; + font-size: 12px; + letter-spacing: 1px; + /* padding-bottom: 10px; */ + /* 设置溢出隐藏显示... */ + /* overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; */ + display: -webkit-box; + -webkit-line-clamp: 12; /* 限制显示的行数 */ + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; +} + /* 索道信息窗口样式 */ .map-container-item-ropeway span:first-child { padding-left: 16px; @@ -373,8 +442,9 @@ body { /* 中间标题 */ .center-title-box { position: absolute; - top: 15px; + top: 0; left: 50%; + padding: 0 12px; transform: translateX(-50%); z-index: 999; font-size: 32px; @@ -382,4 +452,8 @@ body { color: #fff; letter-spacing: 6px; font-family: "Alibaba PuHuiTi R"; + /* 加一个浅蓝色渐变背景颜色 */ + background: linear-gradient(to right, #c9d6ff, #e2e2e2); + color: #063268; + border-radius: 2px; } diff --git a/src/main/resources/static/img/digitalSignage/line_red.png b/src/main/resources/static/img/digitalSignage/line_red.png new file mode 100644 index 0000000000000000000000000000000000000000..cd53d65ddac7302186f42fce14de58bfd0395145 GIT binary patch literal 2180 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 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 b006f39..d4bf407 100644 --- a/src/main/resources/static/js/synthesisQuery/digitalSignage.js +++ b/src/main/resources/static/js/synthesisQuery/digitalSignage.js @@ -6,9 +6,11 @@ let towerList = []; // 塔列表 let crossingList = []; // 跨越列表 let crossingListNew = []; // 跨越列表 let highwayList = []; // 公路列表 +let aThousandFieldsList = []; // 千张场地 let intLng = 116.254; // 初始经度 let intLat = 39.965; // 初始纬度 let isMap = true; // 是否是地图模式 +let projectOverview = ""; // 工程概况 let projectTitle = ""; // 项目名称 let centerTitle = ""; // 中间标题 // 图例数据 @@ -57,12 +59,17 @@ const legendData = [ { name: "架线施工", value: 0, - icon: "../../img/digitalSignage/zt_red.png", + icon: "../../img/digitalSignage/line_yellow.png", }, + // { + // name: "架线施工完成", + // value: 0, + // icon: "../../img/digitalSignage/zt_purple.png", + // }, { name: "架线施工完成", value: 0, - icon: "../../img/digitalSignage/zt_purple.png", + icon: "../../img/digitalSignage/line_red.png", }, { name: "附件安装完成", @@ -140,6 +147,12 @@ function getLocationInfo(id) { highwayList = []; } + if (data.aThousandFieldsList.length > 0) { + aThousandFieldsList = data.aThousandFieldsList; + } else { + aThousandFieldsList = []; + } + // 处理一下交叉信息 if (crossingList && crossingList.length > 0) { crossingList.forEach((item) => { @@ -272,6 +285,7 @@ function initMap() { setTimeout(() => { addAllMapPoints(); addMapLine(); + addMapAThousandFields(); }, 1000); } @@ -286,7 +300,8 @@ function addAllMapPoints() { const iconTypeList = { // 1: "../../img/digitalSignage/icon_three.png", 1: "../../img/digitalSignage/icon_three_new.png", - 2: "../../img/digitalSignage/icon_two.png", + // 2: "../../img/digitalSignage/icon_two.png", + 2: "../../img/digitalSignage/icon_two_new.png", // 3: "../../img/digitalSignage/icon_five.png", 3: "../../img/digitalSignage/icon_five_new.png", // 4: "../../img/digitalSignage/icon_seven.png", @@ -297,11 +312,11 @@ function addAllMapPoints() { // 6: "../../img/digitalSignage/icon_six.png", 6: "../../img/digitalSignage/zt_orange.png", 7: "../../img/digitalSignage/zt_red.png", - 8: "../../img/digitalSignage/zt_purple.png", - 9: "../../img/digitalSignage/zt_green.png", - 0: "../../img/digitalSignage/zt_green.png", + 8: "../../img/digitalSignage/zt_red.png", // 新增的工序 + 9: "../../img/digitalSignage/zt_purple.png", + 10: "../../img/digitalSignage/zt_green.png", // 0: "../../img/digitalSignage/icon_one.png", - 11: "../../img/digitalSignage/icon_one_new.png", + 0: "../../img/digitalSignage/icon_one_new.png", 12: "../../img/digitalSignage/sd.png", 20: "../../img/digitalSignage/project.png", // 21: "../../img/digitalSignage/zt_white.png", @@ -963,14 +978,22 @@ function addMapLine() { let lineColor = ""; let lineStyle = ""; if ( - startPoint.towerProgress === 8 && - endPoint.towerProgress === 8 + (startPoint.towerProgress === 8 && + endPoint.towerProgress === 7) || + (startPoint.towerProgress === 8 && endPoint.towerProgress === 8) ) { - lineColor = "#5ad8a6"; + lineColor = "#FFFF00"; lineStyle = "solid"; } else if (endPoint.existSpan === 1) { lineColor = "#d81e06"; lineStyle = "dashed"; + } else if ( + (startPoint.towerProgress === 8 && + endPoint.towerProgress === 8) || + (startPoint.towerProgress === 9 && endPoint.towerProgress === 8) + ) { + lineColor = "#d81e06"; // 黄色 + lineStyle = "solid"; } else { lineColor = "#fff"; lineStyle = "dashed"; @@ -1123,6 +1146,44 @@ function getSegmentColor(startPoint, endPoint) { return config.polyline.strokeColor; } +// 绘制千张场地区域图 +function addMapAThousandFields() { + if (aThousandFieldsList.length > 0) { + aThousandFieldsList.forEach((item) => { + if ( + item.cablewaTransPointVoList && + item.cablewaTransPointVoList.length > 0 + ) { + let points = []; + // 根据sort字段排序 防止点位顺序不一致 + item.cablewaTransPointVoList.forEach((j) => { + points.push(new BMapGL.Point(j.lng, j.lat)); + }); + + if (points.length > 0) { + // // 2. 创建折线连接这些点位 + var polyline = new BMapGL.Polyline(points, { + strokeColor: "#0C14CA", // 线颜色 + strokeWeight: 4, // 线宽 + strokeOpacity: 0.8, // 线透明度 + }); + map.addOverlay(polyline); + + // 绘制区域 + var polygon = new BMapGL.Polygon(points, { + strokeColor: "#00FFFF", // 线颜色 + strokeWeight: 4, // 线宽 + strokeOpacity: 0.8, // 线透明度 + fillColor: "#00FFFF", // 填充颜色 + fillOpacity: 0.3, // 填充透明度 + }); + // polygonView = polygon; + map.addOverlay(polygon); + } + } + }); + } +} // 获取组织树数据 function getOrgTreeData() { ajaxRequest( @@ -1165,6 +1226,10 @@ function getOrgTreeData() { } // getScrollData(nodeId); + $(".project-overview-content").text( + treeData[0].children[0].children[0].projectOverview || + "暂无" + ); getLegendData(nodeId); getLocationInfo(nodeId); } else { @@ -1459,6 +1524,9 @@ document.addEventListener("DOMContentLoaded", function () { $(".center-title-box").text( projectTitle + "作战图" ); + $(".project-overview-content").text( + obj.data.projectOverview || "暂无" + ); // getScrollData(nodeId); getLegendData(nodeId); getLocationInfo(nodeId); @@ -1555,6 +1623,10 @@ document.addEventListener("DOMContentLoaded", function () { } // getScrollData(nodeId); + $(".project-overview-content").text( + treeData[0].children[0].children[0].projectOverview || + "暂无" + ); getLegendData(nodeId); getLocationInfo(nodeId); } else { @@ -1562,4 +1634,30 @@ document.addEventListener("DOMContentLoaded", function () { } } }); + + // 设置当鼠标移入工程概况时，并且判断当前是否溢出，溢出时预览框显示 + const projectOverviewBox = document.querySelector(".project-overview-box"); + const projectOverviewContent = document.querySelector( + ".project-overview-content" + ); + const projectOverviewPreviewBox = document.querySelector( + ".project-overview-preview-box" + ); + projectOverviewBox.addEventListener("mouseenter", function () { + if ( + projectOverviewContent.scrollHeight > + projectOverviewContent.clientHeight + ) { + projectOverviewPreviewBox.style.display = "block"; + projectOverviewPreviewBox.innerHTML = + projectOverviewContent.innerHTML; + } else { + projectOverviewPreviewBox.style.display = "none"; + projectOverviewPreviewBox.innerHTML = ""; + } + }); + projectOverviewBox.addEventListener("mouseleave", function () { + projectOverviewPreviewBox.style.display = "none"; + projectOverviewPreviewBox.innerHTML = ""; + }); }); diff --git a/src/main/resources/static/pages/basic/lineManagement/child/lineFormTemp.html b/src/main/resources/static/pages/basic/lineManagement/child/lineFormTemp.html index 3e24f57..871b156 100644 --- a/src/main/resources/static/pages/basic/lineManagement/child/lineFormTemp.html +++ b/src/main/resources/static/pages/basic/lineManagement/child/lineFormTemp.html @@ -162,8 +162,12 @@
工程概况：
- + + + +
diff --git a/src/main/resources/static/pages/synthesisQuery/digitalSignage.html b/src/main/resources/static/pages/synthesisQuery/digitalSignage.html index 06b56ab..1117c45 100644 --- a/src/main/resources/static/pages/synthesisQuery/digitalSignage.html +++ b/src/main/resources/static/pages/synthesisQuery/digitalSignage.html @@ -76,6 +76,21 @@ + +
+
+ 工程概况 +
+ +
+
+ + + +
+
+
+