增加杆塔配置

src/main/resources/static/js/publicJs.js

@@ -6,12 +6,12 @@ var  url=window.location.href;
 
 let test_url="http://192.168.0.14:11998/gzDigitalSignage";
 let dev_url="http://36.33.26.201:21100/gzDigitalSignage";
-let local_url="http://192.168.0.39:11998/gzDigitalSignage";
+let local_url="http://127.0.0.1:11998/gzDigitalSignage";
 let dataUrl = "http://112.27.246.86:21997/gzDigitalSignage"
 
 if(url.indexOf("36.33.26.201")!=-1){
     dataUrl = dev_url;
-}else if(url.indexOf("127.0.0.1")!=-1 || url.indexOf("localhost")!=-1 || url.indexOf("192.168.0.39")!=-1){
+}else if(url.indexOf("127.0.0.1")!=-1 || url.indexOf("localhost")!=-1 || url.indexOf("192.168.0.90")!=-1){
     dataUrl = local_url
 }else if(url.indexOf("192.168.0.14")!=-1){
      dataUrl = test_url

src/main/resources/static/js/synthesisQuery/digitalSignage-new.js

@@ -935,14 +935,17 @@ async function addAllMapPoints(graphicLayer, mars3d, Cesium) {
                     item.baiduLon,
                     item.baiduLat
                 );
+
+                const heightInit = index % 2 === 0 ? 68.5 : 80;
                 return {
-                    alt: altitude - 56, // 海拔高度 根据经纬度计算
+                    alt: altitude - heightInit, // 海拔高度 根据经纬度计算
                     heading: 23.0667, // 方向
                     headingStr: "23°4′", // 方向字符串
-                    height: 56, // 杆塔高度
+                    height: heightInit, // 杆塔高度
                     lat: item.baiduLat, // 纬度
                     lon: item.baiduLon, // 经度
                     ...item,
+                    type: index % 2 === 0 ? "1" : "2",
                 };
             })
         );
@@ -1548,7 +1551,7 @@ function showData(arrdata, graphicLayer) {
         item.index = i + 1;
 
         // 模型比例，根据塔高换算
-        item.scale = item.height / 52;
+        item.scale = item.height / (item.type === "1" ? 69 : 80.5);
 
         // 测试塔顶高度与实际高度是否一致
         // const positionTop = mars3d.PointUtil.addPositionsHeight(position, item.height) // 顶部点
@@ -1625,13 +1628,13 @@ function showData(arrdata, graphicLayer) {
 
         drawWireTowerModel(graphicLayer, position, degree, item.scale, item);
         drawWireTowerJYZModel(newPoint1, degree, graphicLayer); // 3个悬垂串模型
-        drawWireTowerJYZModel(newPoint2, degree, graphicLayer);
+        // drawWireTowerJYZModel(newPoint2, degree, graphicLayer);
         drawWireTowerJYZModel(newPoint3, degree, graphicLayer);
 
         // 计算路线点
         const jyzHeight = -5;
         newPoint1 = mars3d.PointUtil.addPositionsHeight(newPoint1, jyzHeight);
-        newPoint2 = mars3d.PointUtil.addPositionsHeight(newPoint2, jyzHeight);
+        // newPoint2 = mars3d.PointUtil.addPositionsHeight(newPoint2, jyzHeight);
         newPoint3 = mars3d.PointUtil.addPositionsHeight(newPoint3, jyzHeight);
 
         if (i === 0) {
@@ -1669,11 +1672,11 @@ function showData(arrdata, graphicLayer) {
 
     // 绘制路线
     drawGuideLine(polylines1, "#0000ff", graphicLayer);
-    drawGuideLine(polylines2, "#cccccc", graphicLayer);
+    // drawGuideLine(polylines2, "#cccccc", graphicLayer);
     drawGuideLine(polylines3, "#ff0000", graphicLayer);
 
     polylines1 = mars3d.LngLatArray.toArray(polylines1);
-    polylines2 = mars3d.LngLatArray.toArray(polylines2);
+    // polylines2 = mars3d.LngLatArray.toArray(polylines2);
     polylines3 = mars3d.LngLatArray.toArray(polylines3);
 }
 
@@ -1703,7 +1706,10 @@ function drawWireTowerModel(graphicLayer, position, degree, scale, item) {
     const graphic = new mars3d.graphic.ModelPrimitive({
         position,
         style: {
-            url: "https://data.mars3d.cn/gltf/mars/tower/tower-500kV.glb",
+            url:
+                item.type === "1"
+                    ? "../../img/3d-model/tower_1.glb"
+                    : "../../img/3d-model/tower_2.glb",
             heading: degree,
             scale: scale,
             distanceDisplayCondition: new Cesium.DistanceDisplayCondition(

src/main/resources/static/pages/basic/lineManagement/child/towerFormTemp.html

@@ -131,6 +131,21 @@
                 </div>
             </div>
 
+            <div class="layui-form-item">
+                <label class="layui-form-label"><span class="required-mark">*</span>杆塔类型:</label>
+                <div class="layui-input-inline">
+                    <!-- 下拉选 -->
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label"><span class="required-mark">*</span>海拔高度:</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="altitude" lay-verify="required|number" autocomplete="off"
+                        placeholder="请输入海拔高度" class="layui-input" maxlength="5">
+                </div>
+            </div>
+
             <button type="submit" id="formSubmit" class="layui-btn" lay-submit lay-filter="formData"
                 style="display: none;"></button>
         </form>