Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB

zhanmingkan

2022-05-17 e8d9f2bb15b9e2a0aedafa2e7d56e741b2296f8a

 assets/map/map3D.js

@@ -1410,7 +1410,6 @@
}

function initDrawEntity(){//zzf:初始化图形

   let token = window.localStorage.getItem("token");
    $.ajax({
      type: "get",
@@ -1463,7 +1462,7 @@
         horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
         disableDepthTestDistance: Number.POSITIVE_INFINITY,
         heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000000000.0)
         distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
      },
      billboard: {
         image: iconPath,
@@ -1474,7 +1473,7 @@
         horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
         disableDepthTestDistance: Number.POSITIVE_INFINITY,
         heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000000000.0)
         distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
      }
   });
   if(drawEntity.content!=null&&drawEntity.content!=""){
@@ -1527,7 +1526,8 @@
         clampToGround: true,
         width: drawEntity.fontsize?drawEntity.fontsize:1,
         material: drawEntity.color?Cesium.Color.fromCssColorString(drawEntity.color):new Cesium.Color.fromBytes(255,124,0,255),
         positions:measureLinePositonsArray
         positions:measureLinePositonsArray,
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000.0)
      },
      drawpointArr: drawpointArr,
      measureLinePositonsArray: measureLinePositonsArray
@@ -1577,7 +1577,8 @@
         outlineColor: Cesium.Color.WHITE,
         hierarchy: new Cesium.CallbackProperty(function () {
            return polygon;
         }, false)
         }, false),
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000.0)
      }
   });
   if(drawEntity.content!=null&&drawEntity.content!=""){
@@ -1619,7 +1620,7 @@
         horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
         disableDepthTestDistance: Number.POSITIVE_INFINITY,
         heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000000000.0)
         distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
      },
      billboard: {
         image: iconPath,
@@ -1630,7 +1631,7 @@
         horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
         disableDepthTestDistance: Number.POSITIVE_INFINITY,
         heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000000000.0)
         distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
      }
   });
   if(drawEntity.content!=null&&drawEntity.content!=""){