diff --git a/src/main/resources/static/js/basic/lineManagement/child/threeSpanList.js b/src/main/resources/static/js/basic/lineManagement/child/threeSpanList.js
index fb620c9..dc6d209 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/threeSpanList.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/threeSpanList.js
@@ -125,7 +125,7 @@ function initTable(dataList, limit, page) {
d.verticalDistance +
"(m)
";
html +=
- "安全裕度:" + d.safetyMargin + "(°)
";
+ "安全裕度:" + d.safetyMargin + "(m)
";
return html;
} else if (d.spanType == 2) {
var html = "";
diff --git a/src/main/resources/static/js/synthesisQuery/digitalSignage-new.js b/src/main/resources/static/js/synthesisQuery/digitalSignage-new.js
index 319e2aa..0715ec4 100644
--- a/src/main/resources/static/js/synthesisQuery/digitalSignage-new.js
+++ b/src/main/resources/static/js/synthesisQuery/digitalSignage-new.js
@@ -849,7 +849,7 @@ async function addAllMapPoints() {
安全裕度
- ${pointData.safetyMargin} °
+ ${pointData.safetyMargin} m
`;
@@ -879,15 +879,29 @@ async function addMapLine() {
let lineMaterial = null; // 用于存储线材质
// 判断条件部分保持不变
- if (
- startPoint.towerProgress === 8 &&
- endPoint.towerProgress === 8
- ) {
- lineColor = "#FFFF00";
- lineMaterial = new Cesium.ColorMaterialProperty({
- // 实线
- color: Cesium.Color.fromCssColorString(lineColor),
+ if (startPoint.towerProgress == 8 && endPoint.towerProgress == 8) {
+ // lineColor = "#FFFF00";
+ // lineMaterial = new Cesium.ColorMaterialProperty({
+ // // 实线
+ // color: Cesium.Color.fromCssColorString("#FFFF00"),
+ // });
+
+ // 创建线段点数组
+ 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, // 线宽(像素)
+ color: "#FFFF00", // 使用动态设置的材质
+ clampToGround: true, // 是否贴地(山区建议设为true)
+ },
});
+ graphicLayer.addGraphic(polyline);
+ graphicLayerList.push(polyline);
} else if (
endPoint.existSpan === 1 &&
startPoint.existSpan === 1 &&
@@ -904,17 +918,51 @@ async function addMapLine() {
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) ||
(startPoint.towerProgress === 10 &&
endPoint.towerProgress === 10)
) {
- lineColor = "#d81e06";
- lineMaterial = new Cesium.ColorMaterialProperty({
- // 实线
- color: Cesium.Color.fromCssColorString(lineColor),
+ // lineColor = "#d81e06";
+ // lineMaterial = new Cesium.ColorMaterialProperty({
+ // // 实线
+ // color: Cesium.Color.fromCssColorString(lineColor),
+ // });
+
+ // 创建线段点数组
+ const positions = [
+ [startPoint.baiduLon, startPoint.baiduLat],
+ [endPoint.baiduLon, endPoint.baiduLat],
+ ];
+ const polyline = new mars3d.graphic.PolylineEntity({
+ positions: positions,
+ eventParent: false,
+ style: {
+ width: 2, // 线宽(像素)
+ color: "#d81e06", // 使用动态设置的材质
+ clampToGround: true, // 是否贴地(山区建议设为true)
+ },
});
+ graphicLayer.addGraphic(polyline);
+ graphicLayerList.push(polyline);
} else {
lineColor = "#fff";
lineMaterial = new Cesium.PolylineDashMaterialProperty({
@@ -924,28 +972,6 @@ async function addMapLine() {
dashLength: 16.0, // 可调整虚线长度
});
}
-
- // 创建线段点数组
- const positions = [
- [startPoint.baiduLon, startPoint.baiduLat],
- [endPoint.baiduLon, endPoint.baiduLat],
- ];
-
- // const positions2 = positions.map((item) => {
- // return mars3d.PointTrans.bd2wgs(item);
- // });
-
- const polyline = new mars3d.graphic.PolylineEntity({
- positions: positions,
- eventParent: false,
- style: {
- width: 2, // 线宽(像素)
- material: lineMaterial, // 使用动态设置的材质
- clampToGround: true, // 是否贴地(山区建议设为true)
- },
- });
- graphicLayer.addGraphic(polyline);
- graphicLayerList.push(polyline);
}
}
diff --git a/src/main/resources/static/js/synthesisQuery/digitalSignage.js b/src/main/resources/static/js/synthesisQuery/digitalSignage.js
index 80c6607..343573a 100644
--- a/src/main/resources/static/js/synthesisQuery/digitalSignage.js
+++ b/src/main/resources/static/js/synthesisQuery/digitalSignage.js
@@ -904,7 +904,7 @@ function addAllMapPoints() {
安全裕度
- ${pointData.safetyMargin} °
+ ${pointData.safetyMargin} m
`;
diff --git a/src/main/resources/static/pages/basic/lineManagement/child/threeSpanFormTemp.html b/src/main/resources/static/pages/basic/lineManagement/child/threeSpanFormTemp.html
index b9161ca..05463d1 100644
--- a/src/main/resources/static/pages/basic/lineManagement/child/threeSpanFormTemp.html
+++ b/src/main/resources/static/pages/basic/lineManagement/child/threeSpanFormTemp.html
@@ -120,7 +120,7 @@