diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index bae0d07..35b5ec7 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -9,7 +9,6 @@ - 项目一体化作战动态管控平台 @@ -39,78 +38,66 @@ - +
+ + + +
+ 修改密码 +
+
+ + 退出 +
+
+ + - - - -
-
- +
- -
-
- -
-
- +
+
+
    +
  • + + +
    • +
+
+
+ +
-
- +
\ No newline at end of file diff --git a/src/main/resources/static/js/basic/lineManagement/child/setLonAndLat.js b/src/main/resources/static/js/basic/lineManagement/child/setLonAndLat.js index 7909bbb..fdfdfa6 100644 --- a/src/main/resources/static/js/basic/lineManagement/child/setLonAndLat.js +++ b/src/main/resources/static/js/basic/lineManagement/child/setLonAndLat.js @@ -55,7 +55,7 @@ function initData() { let points = JSON.parse(objParams.points) intLng = points[0].lng; intLat = points[0].lat; - }else{ + } else { intLng = list[0].proLon ? list[0].proLon : list[0].lon; intLat = list[0].proLat ? list[0].proLat : list[0].lat; } @@ -74,13 +74,15 @@ function initMap(list) { // 以第一个点为中心初始化地图 map.centerAndZoom(new BMapGL.Point(intLng, intLat), 16); - map.setTilt(60); //设置地图的倾斜角度 + map.setTilt(65); //设置地图的倾斜角度 map.enableScrollWheelZoom(true); // 启用滚轮缩放 - // map.setTilt(60); // 设置地图倾斜角度 - // map.setDisplayOptions({ - // building: true, // 显示3D建筑物 - // }); + // 设置显示3D建筑物 + map.setDisplayOptions({ + building: true, // 显示3D建筑物 + indoor: false, + poi: true + }); var navigationControl = new BMapGL.NavigationControl3D(); map.addControl(navigationControl); @@ -168,49 +170,51 @@ function initMap(list) { }); } initTowerLine(list); - // 点击地图添加标记 - map.addEventListener("click", function (e) { - addMarker(e.latlng.lng, e.latlng.lat); - }); - if (objParams.points) { let points = JSON.parse(objParams.points) $.each(points, function (i, item) { addMarker(item.lng, item.lat) viewPointLine(); }) + } else { + // 点击地图添加标记 + map.addEventListener("click", function (e) { + addMarker(e.latlng.lng, e.latlng.lat); + }); } +} - function addMarker(lng, lat) { - var point = new BMapGL.Point(lng, lat); - // 创建点标记 - var marker = new BMapGL.Marker(point); - // 添加到地图 - map.addOverlay(marker); - // 创建标签 - var label = new BMapGL.Label("点" + (markerCount + 1), { - position: point, - offset: new BMapGL.Size(10, -30) - }); - label.setStyle({ - color: "#333", - fontSize: "12px", - fontWeight: "bold", - backgroundColor: "rgba(255,255,255,0.9)", - border: "1px solid #ddd", - borderRadius: "4px", - padding: "2px 6px" - }); - map.addOverlay(label); - // 存储标记和标签 - markers.push({ - marker: marker, - label: label, - point: point - }); - // 更新计数器 - markerCount++; - } +// 添加点坐标 +function addMarker(lng, lat) { + var point = new BMapGL.Point(lng, lat); + // 创建点标记 + var marker = new BMapGL.Marker(point); + // 添加到地图 + map.addOverlay(marker); + // 创建标签 + var label = new BMapGL.Label("点" + (markerCount + 1), { + position: point, + offset: new BMapGL.Size(10, -30) + }); + label.setStyle({ + color: "#333", + fontSize: "12px", + fontWeight: "bold", + backgroundColor: "rgba(255,255,255,0.9)", + border: "1px solid #ddd", + borderRadius: "4px", + padding: "2px 6px" + }); + map.addOverlay(label); + // 存储标记和标签 + markers.push({ + marker: marker, + label: label, + point: point + }); + console.log(markers) + // 更新计数器 + markerCount++; } // 杆塔连线 @@ -263,7 +267,7 @@ function initTowerLine(points) { ); // 4. 设置3D参数 var zoom = map.getZoom(); - var newTilt = 60; + var newTilt = 65; var newHeading = 30; // 5. 应用3D视角 @@ -315,6 +319,10 @@ function viewPointLine() { }); polylineView = polyline; map.addOverlay(polyline); + // 点击地图添加标记 + map.addEventListener("click", function (e) { + addMarker(e.latlng.lng, e.latlng.lat); + }); } // 保存点位数据 @@ -331,7 +339,7 @@ function saveData() { points.push({ lng: item.point.lng, lat: item.point.lat, - sort:index + 1 + sort: index + 1 }); }) let frameId = parent.document.getElementById('addDataRopeway').getElementsByTagName("iframe")[0]; diff --git a/src/main/resources/static/login.html b/src/main/resources/static/login.html index ed783f2..3ae1206 100644 --- a/src/main/resources/static/login.html +++ b/src/main/resources/static/login.html @@ -13,7 +13,6 @@