Merge remote-tracking branch 'origin/master' into master

zengh

2020-11-13 8274f20d8093486dc3d54e074d25b6e412f4e4c7

 jimu.js/MapManager.js

@@ -90,7 +90,7 @@
                // this.map.extend(Cesium.viewerDragDropMixin);
                this.map.scene.globe.depthTestAgainstTerrain = false;
                this.map.scene.logarithmicDepthBuffer = false;
                this.map.scene.globe.baseColor = Cesium.Color.WHITESMOKE ;
                this.map.scene.globe.baseColor = Cesium.Color.BLACK;
                window.viewer = this.map;
                window.dcViewer = dcViewer;
                var imageryLayers = this.map.imageryLayers;
@@ -138,7 +138,7 @@


                //设置离线地图默认显示
                this.map.baseLayerPicker.viewModel.selectedImagery = this.map.baseLayerPicker.viewModel.imageryProviderViewModels[1];
                this.map.baseLayerPicker.viewModel.selectedImagery = this.map.baseLayerPicker.viewModel.imageryProviderViewModels[2];
                this.map.baseLayerPicker.viewModel.selectedTerrain = this.map.baseLayerPicker.viewModel.terrainProviderViewModels[2];
                $(".cesium-baseLayerPicker-sectionTitle").eq(0).html("底图");
                $(".cesium-baseLayerPicker-sectionTitle").eq(1).html("地形");
@@ -191,6 +191,7 @@
                                    'http://cache1.arcgisonline.cn/arcgis/rest/services/SimpleFeature/ChinaBoundaryLine/MapServer'
                            })
                        }

                        else if (layerConfig.type == "mapbox") {
                            layer = new Cesium.MapboxImageryProvider({
                                mapId: 'mapbox.country-boundaries-v1',