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

zhanmingkan

2022-05-17 e8d9f2bb15b9e2a0aedafa2e7d56e741b2296f8a

 libs/Cesiumplus/CesiumDraw.js

@@ -169,7 +169,8 @@
               outlineColor: Cesium.Color.WHITE,
               hierarchy: new Cesium.CallbackProperty(function () {
                  return polygon;
               }, false)
               }, false),
               distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000.0)
            }
         });

@@ -314,6 +315,7 @@
               clampToGround: true,
               width: 1,
               material: options.polylinecolor,
               distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000.0)
            },
            drawpointArr: [],
            measureLinePositonsArray: measureLinePositonsArray
@@ -486,7 +488,7 @@
                  text: pointText,
                  disableDepthTestDistance: Number.POSITIVE_INFINITY,
                  heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
                  distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
                  distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
               },
               billboard: {
                  image: "../assets/images/icon/icon1.png",
@@ -497,7 +499,7 @@
                  horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                  disableDepthTestDistance: Number.POSITIVE_INFINITY,//广告牌不进行深度检测
                  heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
                  distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
                  distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
               }
            });
            entity.title =  pointText;
@@ -546,7 +548,7 @@
                  text: labelText,
                  disableDepthTestDistance: Number.POSITIVE_INFINITY,
                  heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
                  distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
                  distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
               },
               billboard: {
                  image: "../assets/images/icon/icon1.png",
@@ -557,7 +559,7 @@
                  horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                  disableDepthTestDistance: Number.POSITIVE_INFINITY,//广告牌不进行深度检测
                  heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
                  distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
                  distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
               }
            });
            entity.title =  labelText;