From 8758cff5eac55007e841f8344efea76e08b5d36b Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 4 Aug 2025 10:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/synthesisQuery/digitalSignage.css | 13 +- .../basic/lineManagement/child/qzSiteList.js | 2 +- .../js/synthesisQuery/digitalSignage-new.js | 177 +++++++++--------- 3 files changed, 97 insertions(+), 95 deletions(-) diff --git a/src/main/resources/static/css/synthesisQuery/digitalSignage.css b/src/main/resources/static/css/synthesisQuery/digitalSignage.css index 2c0bf30..d56b849 100644 --- a/src/main/resources/static/css/synthesisQuery/digitalSignage.css +++ b/src/main/resources/static/css/synthesisQuery/digitalSignage.css @@ -188,7 +188,7 @@ body { .map-container h4 { margin: 0 0 8px 0; - font-size: 16px; + font-size: 20px; border-bottom: 1px solid rgba(255, 255, 255, 0.2); padding-bottom: 5px; } @@ -198,11 +198,12 @@ body { display: flex; align-items: center; justify-content: space-between; - font-size: 14px; + font-size: 18px; } .map-container-item-ropeway { display: flex; + font-size: 18px; } .map-container-item span:first-child { width: 160px; @@ -217,7 +218,7 @@ body { position: absolute; bottom: 35px; left: 15px; - width: 40%; + width: 30%; padding: 10px; background: rgba(0, 0, 0, 0.6); border-radius: 10px; @@ -230,7 +231,7 @@ body { } .project-overview-preview-box { - width: 260px; + width: 180px; background: rgba(0, 0, 0, 0.6); position: absolute; /* 定位使预览盒子在工程概况的右边 */ @@ -238,7 +239,7 @@ body { right: -105%; z-index: 1000; display: none; - font-size: 14px; + font-size: 16px; color: #fff; border-radius: 10px; padding: 10px; @@ -268,7 +269,7 @@ body { text-indent: 2em; /* max-height: 220px; */ color: #fff; - font-size: 16px; + font-size: 17px; letter-spacing: 1px; /* padding-bottom: 10px; */ /* 设置溢出隐藏显示... */ diff --git a/src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js b/src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js index b523b22..dcceef5 100644 --- a/src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js +++ b/src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js @@ -121,7 +121,7 @@ function initTable(dataList, limit, page) { // align: "center", // }, { - field: "name", + field: "towerName", title: "名称", unresize: true, align: "center", diff --git a/src/main/resources/static/js/synthesisQuery/digitalSignage-new.js b/src/main/resources/static/js/synthesisQuery/digitalSignage-new.js index 3e5eef5..a12626f 100644 --- a/src/main/resources/static/js/synthesisQuery/digitalSignage-new.js +++ b/src/main/resources/static/js/synthesisQuery/digitalSignage-new.js @@ -759,74 +759,76 @@ async function addAllMapPoints() { // console.log("点击了标点", event.graphic.attr); console.log(event, "pointData点击了----"); + + //
+ //

+ // ${pointData.towerInfoVo.towerName} + //

+ //
+ // 协调完成 + // ${ + // pointData.towerInfoVo.time1 || "/" + // } + //
+ //
+ // 基础开挖 + // + // ${pointData.towerInfoVo.time2 || "/"} + // + //
+ //
+ // 基础开挖完成 + // + // ${pointData.towerInfoVo.time3 || "/"} + // + //
+ //
+ // 基础浇筑 + // + // ${pointData.towerInfoVo.time4 || "/"} + // + //
+ //
+ // 基础浇筑完成 + // + // ${pointData.towerInfoVo.time5 || "/"} + // + //
+ //
+ // 铁塔组立 + // + // ${pointData.towerInfoVo.time6 || "/"} + // + //
+ //
+ // 铁塔组立完成 + // + // ${pointData.towerInfoVo.time7 || "/"} + // + //
+ //
+ // 架线施工 + // + // ${pointData.towerInfoVo.time8 || "/"} + // + //
+ //
+ // 架线施工完成 + // + // ${pointData.towerInfoVo.time9 || "/"} + // + //
+ //
+ // 附件安装完成 + // + // ${pointData.towerInfoVo.time10 || "/"} + // + //
+ //
const graphic = event.graphic; const infoContent = `
-
-

- ${pointData.towerInfoVo.towerName} -

-
- 协调完成 - ${ - pointData.towerInfoVo.time1 || "/" - } -
-
- 基础开挖 - - ${pointData.towerInfoVo.time2 || "/"} - -
-
- 基础开挖完成 - - ${pointData.towerInfoVo.time3 || "/"} - -
-
- 基础浇筑 - - ${pointData.towerInfoVo.time4 || "/"} - -
-
- 基础浇筑完成 - - ${pointData.towerInfoVo.time5 || "/"} - -
-
- 铁塔组立 - - ${pointData.towerInfoVo.time6 || "/"} - -
-
- 铁塔组立完成 - - ${pointData.towerInfoVo.time7 || "/"} - -
-
- 架线施工 - - ${pointData.towerInfoVo.time8 || "/"} - -
-
- 架线施工完成 - - ${pointData.towerInfoVo.time9 || "/"} - -
-
- 附件安装完成 - - ${pointData.towerInfoVo.time10 || "/"} - -
-
+

交叉跨越信息 ( ${pointData.spanTowerName} ) @@ -912,29 +914,28 @@ async function addMapLine() { startPoint.towerProgress != 10 && endPoint.towerProgress != 10 ) { - lineColor = "#d81e06"; - lineMaterial = new Cesium.PolylineDashMaterialProperty({ - // 虚线 - color: Cesium.Color.fromCssColorString(lineColor), - dashLength: 16.0, // 可调整虚线长度 - }); - - // 创建线段点数组 - const positions = [ - [startPoint.baiduLon, startPoint.baiduLat, 500], - [endPoint.baiduLon, endPoint.baiduLat, 500], - ]; - const polyline = new mars3d.graphic.PolylineEntity({ - positions: positions, - eventParent: false, - style: { - width: 2, // 线宽（像素） - material: lineMaterial, // 使用动态设置的材质 - clampToGround: true, // 是否贴地（山区建议设为true） - }, - }); - graphicLayer.addGraphic(polyline); - graphicLayerList.push(polyline); + // lineColor = "#d81e06"; + // lineMaterial = new Cesium.PolylineDashMaterialProperty({ + // // 虚线 + // color: Cesium.Color.fromCssColorString(lineColor), + // dashLength: 16.0, // 可调整虚线长度 + // }); + // // 创建线段点数组 + // const positions = [ + // [startPoint.baiduLon, startPoint.baiduLat, 500], + // [endPoint.baiduLon, endPoint.baiduLat, 500], + // ]; + // const polyline = new mars3d.graphic.PolylineEntity({ + // positions: positions, + // eventParent: false, + // style: { + // width: 2, // 线宽（像素） + // material: lineMaterial, // 使用动态设置的材质 + // clampToGround: true, // 是否贴地（山区建议设为true） + // }, + // }); + // graphicLayer.addGraphic(polyline); + // graphicLayerList.push(polyline); } else if ( (startPoint.towerProgress === 9 && endPoint.towerProgress === 9) ||