标绘，分屏，对比BUG修复

nnnjjj123

2020-11-17 56239828469da7d8cef92cc6bf9d99c858168bb5

标绘，分屏，对比BUG修复

 widgets/Measurement/Widget.js

@@ -37,6 +37,7 @@
                });
                $('#measuerLengths').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    window.dcViewer.scene.globe.depthTestAgainstTerrain =false;
                    measureSurface.measuerLength({
                        terrain: !1,
                        unit: _type,
@@ -45,6 +46,7 @@

                $('#measuerLength2').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    window.dcViewer.scene.globe.depthTestAgainstTerrain =false;
                    measureSurface.measuerLength({
                        terrain: !0,
                        unit: _type,
@@ -52,6 +54,7 @@
                })
                $('#measureArea').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    window.dcViewer.scene.globe.depthTestAgainstTerrain =false;
                    measureSurface.measureArea({
                        unit: _type
                    });
@@ -60,6 +63,7 @@

                $('#measureHeight').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    window.dcViewer.scene.globe.depthTestAgainstTerrain =false;
                    measureSurface.measureHeight({
                        isSuper: !1,
                        unit: _type,
@@ -68,6 +72,7 @@

                $('#measureHeight2').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    window.dcViewer.scene.globe.depthTestAgainstTerrain =false;
                    measureSurface.measureHeight({
                        isSuper: !0,
                        unit: _type,
@@ -76,12 +81,14 @@

                $('#clearDraw').click(function () {
                    measureSurface.clearMeasure()
                    window.dcViewer.scene.globe.depthTestAgainstTerrain =true;
                })
                
                $('.xx').click(function () {
                    $('.jimu-widget-Measurement').hide()
                    measureSurface.clearMeasure()
                   window.dcViewer.contextMenu.enable=true;
                   window.dcViewer.scene.globe.depthTestAgainstTerrain =true;
                

                })

 widgets/Plot/css/style.css

@@ -1,7 +1,7 @@
.jimu-widget-Plot{
  width: 100%;
  height: 100%;
  background-color:black;
  background-color:#3c464b;
  font-size: 14px;
  border: 1px solid rgb(22, 33, 46);
  color: rgb(238, 235, 235);

 widgets/Rolling/Widget.html

@@ -3,14 +3,14 @@
        <div class="hezi-left-select">
            <span class="hezi-leftspan" id="gaibian">左侧图层 :</span>
            <select class="hezi-select" id="hezi-selectLeft">
                <option class="optionVal2" value="2">天地图矢量</option>
                <option class="optionVal1" value="1">天地图影像</option>
                <option class="optionVal2" value="2">天地图影像</option>
                <option class="optionVal5" value="1">天地图矢量</option>
            </select>
        </div>
        <div class="hezi-right-select">
            <span class="hezi-rightspan">右侧图层 :</span>
            <select class="hezi-select" id="hezi-selectRight">
                <option class="optionVal3" value="3">天地图矢量</option>
                <option class="optionVal6" value="3">天地图矢量</option>
                <option class="optionVal4" value="2">天地图影像</option>
            </select>
        </div>

 widgets/Rolling/Widget.js

@@ -91,7 +91,6 @@
                    $('.jimu-widget-Rolling').hide();
                    $('#hezi-selectLeft').val(2);
                    $('#hezi-selectRight').val(3);
                    window.dcViewer.contextMenu.enable=true;
                });

                // 加载左边图层
@@ -110,10 +109,9 @@
                    else if ($(this).val() == 1) {
                        viewer.imageryLayers.remove(that.earthAtNightLeft);
                        viewer.imageryLayers.remove(that.zjLeft);
                        // viewer.imageryLayers.remove(that.tiandituLeft);
                        // viewer.imageryLayers.remove(that.tiandituZJLeft);
                        loadMapGzLeft();
                        that.ganZhouYinLeft.splitDirection = Cesium.ImagerySplitDirection.LEFT;
                        loadMapTianRight();
                        that.tiandituLeft.splitDirection = Cesium.ImagerySplitDirection.LEFT;
                        that.tiandituZJLeft.splitDirection = Cesium.ImagerySplitDirection.LEFT;
                    }
                    else {
                        viewer.imageryLayers.remove(that.earthAtNightLeft);
@@ -159,10 +157,10 @@
                    //imageryLayers获取将在地球上渲染的图像图层的集合
                    var layers = viewer.imageryLayers;
                    //addImageryProvider使用给定的ImageryProvider创建一个新层，并将其添加到集合中
                    that.earthAtNightLeft = layers.addImageryProvider(new DC.ImageryLayerFactory.createWMTSImageryLayer(
                    that.earthAtNightLeft = layers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(
                        that.imageryProviderAdd[0]
                    ));
                    that.zjLeft = layers.addImageryProvider(new DC.ImageryLayerFactory.createWMTSImageryLayer(
                    that.zjLeft = layers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(
                        that.imageryProviderAdd[1]
                    ));
                }
@@ -172,8 +170,8 @@
                    //imageryLayers获取将在地球上渲染的图像图层的集合
                    var layers = viewer.imageryLayers;
                    //addImageryProvider使用给定的ImageryProvider创建一个新层，并将其添加到集合中  UrlTemplateImageryProvider
                    that.ganZhouYinLeft = layers.addImageryProvider(new DC.ImageryLayerFactory.createXYZImageryLayer(
                        that.imageryProviderAdd[0]
                    that.ganZhouYinLeft = layers.addImageryProvider(new Cesium.UrlTemplateImageryProvider(
                        that.imageryProviderArrUrl[0]
                    ));
                }

@@ -182,10 +180,10 @@
                    //imageryLayers获取将在地球上渲染的图像图层的集合
                    var layers = viewer.imageryLayers;
                    //addImageryProvider使用给定的ImageryProvider创建一个新层，并将其添加到集合中
                    that.tiandituLeft = layers.addImageryProvider(new DC.ImageryLayerFactory.createXYZImageryLayer(
                    that.tiandituLeft = layers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(
                        that.imageryProviderDian[0]
                    ));
                    that.tiandituZJLeft = layers.addImageryProvider(new DC.ImageryLayerFactory.createXYZImageryLayer(
                    that.tiandituZJLeft = layers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(
                        that.imageryProviderDian[1]
                    ));
                }
@@ -195,10 +193,10 @@
                    //imageryLayers获取将在地球上渲染的图像图层的集合
                    var layers = viewer.imageryLayers;
                    //addImageryProvider使用给定的ImageryProvider创建一个新层，并将其添加到集合中
                    that.earthAtNightRight = layers.addImageryProvider(new DC.ImageryLayerFactory.createWMTSImageryLayer(
                    that.earthAtNightRight = layers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(
                        that.imageryProviderAdd[0]
                    ));
                    that.zjRight = layers.addImageryProvider(new DC.ImageryLayerFactory.createWMTSImageryLayer(
                    that.zjRight = layers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(
                        that.imageryProviderAdd[1]
                    ));
                }
@@ -220,8 +218,8 @@
                 function loadMapGzRight() {
                    //imageryLayers获取将在地球上渲染的图像图层的集合
                    var layers = viewer.imageryLayers;
                    //addImageryProvider使用给定的ImageryProvider创建一个新层，并将其添加到集合中  createXYZImageryLayer
                    that.ganZhouYinRight = layers.addImageryProvider(new DC.ImageryLayerFactory.createXYZImageryLayer(
                    //addImageryProvider使用给定的ImageryProvider创建一个新层，并将其添加到集合中  UrlTemplateImageryProvider
                    that.ganZhouYinRight = layers.addImageryProvider(new Cesium.UrlTemplateImageryProvider(
                        that.imageryProviderArrUrl[0]
                    ));
                }
@@ -279,10 +277,10 @@
                    //imageryLayers获取将在地球上渲染的图像图层的集合
                    var layers = that.map.imageryLayers;
                    //addImageryProvider使用给定的ImageryProvider创建一个新层，并将其添加到集合中
                    that.earthAtNightLeft = layers.addImageryProvider(new DC.ImageryLayerFactory.createWMTSImageryLayer(
                    that.earthAtNightLeft = layers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(
                        that.imageryProviderAdd[0]
                    ));
                    that.zjLeft = layers.addImageryProvider(new DC.ImageryLayerFactory.createWMTSImageryLayer(
                    that.zjLeft = layers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(
                        that.imageryProviderAdd[1]
                    ));
                }

 widgets/Rolling/css/style.css

@@ -80,7 +80,6 @@
  height: 100%;
  left: -100%;
  top: 0%;
  z-index: 22;
}



 widgets/Screen/Widget.js

@@ -17,7 +17,7 @@
            baseClass: 'jimu-widget-Screen',
            name: 'Screen',
            flag: false,
            viewers: '',
            viewers1: '',
            viewerss: '',
            startup: function () {
                var that = this;
@@ -25,55 +25,14 @@
                $('.rollinng-table-hezi-xxs').click(function () {
                    $('.jimu-widget-Screen').hide();
                });
                that.viewers = new Cesium.Viewer('sliders2', {
                    baseLayerPicker: false,
                    animation: false,//是否创建动画小器件，左下角仪表    
                    baseLayerPicker: false,//是否显示图层选择器    
                    fullscreenButton: false,//是否显示全屏按钮    
                    geocoder: false,//是否显示geocoder小器件，右上角查询按钮    
                    homeButton: false,//是否显示Home按钮    
                    infoBox: false,//是否显示信息框    
                    sceneModePicker: false,//是否显示3D/2D选择器    
                    selectionIndicator: false,//是否显示选取指示器组件    
                    timeline: false,//是否显示时间轴    
                    navigationHelpButton: false,//是否显示右上角的帮助按钮 
                    imageryProvider: new Cesium.ArcGisMapServerImageryProvider({
                        url: 'http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetWarm/MapServer'
                    })
                });
                that.viewers._cesiumWidget._creditContainer.style.display = "none";

                that.viewerss = new Cesium.Viewer('sliders1', {
                    baseLayerPicker: false,
                    animation: false,//是否创建动画小器件，左下角仪表    
                    baseLayerPicker: false,//是否显示图层选择器    
                    fullscreenButton: false,//是否显示全屏按钮    
                    geocoder: false,//是否显示geocoder小器件，右上角查询按钮    
                    homeButton: false,//是否显示Home按钮    
                    infoBox: false,//是否显示信息框    
                    sceneModePicker: false,//是否显示3D/2D选择器    
                    selectionIndicator: false,//是否显示选取指示器组件    
                    timeline: false,//是否显示时间轴    
                    navigationHelpButton: false,//是否显示右上角的帮助按钮 
                    imageryProvider: new Cesium.WebMapTileServiceImageryProvider({
                        "label": "天地图影像",
                        "type": "wmts",
                        "url": "http://t0.tianditu.gov.cn/img_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
                        "layer": "img",
                        "style": "default",
                        "format": "tiles",
                        "tileMatrixSetID": "w",
                        "maximumLevel": 17
                    })
                });
                that.viewerss._cesiumWidget._creditContainer.style.display = "none";
                initHandler()
                // 加载左边图层
                $('#hezi-selectLefts').on('change', function () {
                    console.log(that.viewers1, 11111111)
                    $('#sliders2').html("");
                    that.viewers = '';
                    that.viewers1 = '';
                    if ($(this).val() == 2) {
                        that.viewers = new Cesium.Viewer('sliders2', {
                        that.viewers1 = new Cesium.Viewer('sliders2', {
                            baseLayerPicker: false,
                            animation: false,//是否创建动画小器件，左下角仪表    
                            baseLayerPicker: false,//是否显示图层选择器    
@@ -96,11 +55,11 @@
                                "maximumLevel": 17
                            })
                        });
                        that.viewers._cesiumWidget._creditContainer.style.display = "none";
                        initHandler()
                        that.viewers1._cesiumWidget._creditContainer.style.display = "none";
                        that.initHandler()
                    }
                    else if ($(this).val() == 1) {
                        that.viewers = new Cesium.Viewer('sliders2', {
                        that.viewers1 = new Cesium.Viewer('sliders2', {
                            baseLayerPicker: false,
                            animation: false,//是否创建动画小器件，左下角仪表    
                            baseLayerPicker: false,//是否显示图层选择器    
@@ -123,8 +82,8 @@
                                "maximumLevel": 17
                            })
                        });
                        that.viewers._cesiumWidget._creditContainer.style.display = "none";
                        initHandler()
                        that.viewers1._cesiumWidget._creditContainer.style.display = "none";
                        that.initHandler()
                    }
                });

@@ -133,7 +92,7 @@
                $('#hezi-selectRights').on('change', function () {
                    $('#sliders1').html("");
                    that.viewerss = '';
                    if ($(this).val() == 2) {
                    if ($(this).val() == 1) {
                        that.viewerss = new Cesium.Viewer('sliders1', {
                            baseLayerPicker: false,
                            animation: false,//是否创建动画小器件，左下角仪表    
@@ -158,9 +117,9 @@
                            })
                        });
                        that.viewerss._cesiumWidget._creditContainer.style.display = "none";
                        initHandler()
                        that.initHandler()
                    }
                    else if ($(this).val() == 1) {
                    else if ($(this).val() == 2) {
                        that.viewerss = new Cesium.Viewer('sliders1', {
                            baseLayerPicker: false,
                            animation: false,//是否创建动画小器件，左下角仪表    
@@ -185,83 +144,137 @@
                            })
                        });
                        that.viewerss._cesiumWidget._creditContainer.style.display = "none";
                        initHandler()
                        that.initHandler()
                    }
                });


                //鼠标监听事件
                function initHandler() {
                    var _self = this;
                    if (_self.handler && _self.handler.getInputAction(Cesium.ScreenSpaceEventType.MOUSE_MOVE)) {
                        return;
                    }
                    _self.handler = new Cesium.ScreenSpaceEventHandler(that.viewers.scene.canvas);
                    _self.handler1 = new Cesium.ScreenSpaceEventHandler(that.viewerss.scene.canvas);
                    _self.handler.setInputAction(function (movement) {
                        var _camerca = that.viewers.camera;
                        that.viewerss.camera.setView({
                            destination: _camerca.position,
                            orientation: {
                                direction: _camerca._direction,
                                up: _camerca.up,
                                heading: _camerca.heading,
                                pitch: _camerca.pitch,
                                roll: _camerca.roll
                            }
                        });
                    }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);

                    _self.handler.setInputAction(function (movement) {
                        var _camerca = that.viewers.camera;
                        that.viewerss.camera.setView({
                            destination: _camerca.position,
                            orientation: {
                                direction: _camerca._direction,
                                up: _camerca.up,
                                heading: _camerca.heading,
                                pitch: _camerca.pitch,
                                roll: _camerca.roll
                            }
                        });
                    }, Cesium.ScreenSpaceEventType.WHEEL);


                    _self.handler1.setInputAction(function (movement) {
                        var _camerca = that.viewerss.camera;
                        that.viewers.camera.setView({
                            destination: _camerca.position,
                            orientation: {
                                direction: _camerca._direction,
                                up: _camerca.up,
                                heading: _camerca.heading,
                                pitch: _camerca.pitch,
                                roll: _camerca.roll
                            }
                        });
                    }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);

                    _self.handler1.setInputAction(function (movement) {
                        var _camerca = that.viewerss.camera;
                        that.viewers.camera.setView({
                            destination: _camerca.position,
                            orientation: {
                                direction: _camerca._direction,
                                up: _camerca.up,
                                heading: _camerca.heading,
                                pitch: _camerca.pitch,
                                roll: _camerca.roll
                            }
                        });
                    }, Cesium.ScreenSpaceEventType.WHEEL);
                }


            },

            onOpen: function () {
                var that = this;
                that.viewers1 = new Cesium.Viewer('sliders2', {
                    baseLayerPicker: false,
                    animation: false,//是否创建动画小器件，左下角仪表    
                    baseLayerPicker: false,//是否显示图层选择器    
                    fullscreenButton: false,//是否显示全屏按钮    
                    geocoder: false,//是否显示geocoder小器件，右上角查询按钮    
                    homeButton: false,//是否显示Home按钮    
                    infoBox: false,//是否显示信息框    
                    sceneModePicker: false,//是否显示3D/2D选择器    
                    selectionIndicator: false,//是否显示选取指示器组件    
                    timeline: false,//是否显示时间轴    
                    navigationHelpButton: false,//是否显示右上角的帮助按钮 
                    imageryProvider: new Cesium.WebMapTileServiceImageryProvider({
                        "label": "天地图矢量",
                        "type": "wmts",
                        "url": "http://t0.tianditu.gov.cn/vec_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
                        "layer": "vec",
                        "style": "default",
                        "format": "tiles",
                        "tileMatrixSetID": "w",
                        "maximumLevel": 17
                    })
                });
                that.viewers1._cesiumWidget._creditContainer.style.display = "none";

                that.viewerss = new Cesium.Viewer('sliders1', {
                    baseLayerPicker: false,
                    animation: false,//是否创建动画小器件，左下角仪表    
                    baseLayerPicker: false,//是否显示图层选择器    
                    fullscreenButton: false,//是否显示全屏按钮    
                    geocoder: false,//是否显示geocoder小器件，右上角查询按钮    
                    homeButton: false,//是否显示Home按钮    
                    infoBox: false,//是否显示信息框    
                    sceneModePicker: false,//是否显示3D/2D选择器    
                    selectionIndicator: false,//是否显示选取指示器组件    
                    timeline: false,//是否显示时间轴    
                    navigationHelpButton: false,//是否显示右上角的帮助按钮 
                    imageryProvider: new Cesium.WebMapTileServiceImageryProvider({
                        "label": "天地图矢量",
                        "type": "wmts",
                        "url": "http://t0.tianditu.gov.cn/vec_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
                        "layer": "vec",
                        "style": "default",
                        "format": "tiles",
                        "tileMatrixSetID": "w",
                        "maximumLevel": 17
                    })
                });
                that.viewerss._cesiumWidget._creditContainer.style.display = "none";
                that.initHandler()
            },

            //鼠标监听事件
            initHandler: function () {
                var that = this;
                var _self = this;
                // if (_self.handler && _self.handler.getInputAction(Cesium.ScreenSpaceEventType.MOUSE_MOVE) || _self.handler1 && _self.handler1.getInputAction(Cesium.ScreenSpaceEventType.MOUSE_MOVE)) {
                //     return;
                // }
                _self.handler = new Cesium.ScreenSpaceEventHandler(that.viewers1.scene.canvas);
                _self.handler1 = new Cesium.ScreenSpaceEventHandler(that.viewerss.scene.canvas);
                _self.handler.setInputAction(function (movement) {
                    console.log(movement, 2);
                    var _camerca = that.viewers1.camera;
                    that.viewerss.camera.setView({
                        destination: _camerca.position,
                        orientation: {
                            direction: _camerca._direction,
                            up: _camerca.up,
                            heading: _camerca.heading,
                            pitch: _camerca.pitch,
                            roll: _camerca.roll
                        }
                    });
                }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);

                _self.handler.setInputAction(function (movement) {
                    var _camerca = that.viewers1.camera;
                    that.viewerss.camera.setView({
                        destination: _camerca.position,
                        orientation: {
                            direction: _camerca._direction,
                            up: _camerca.up,
                            heading: _camerca.heading,
                            pitch: _camerca.pitch,
                            roll: _camerca.roll
                        }
                    });
                }, Cesium.ScreenSpaceEventType.WHEEL);


                _self.handler1.setInputAction(function (movement) {
                    var _camercas = that.viewerss.camera;
                    that.viewers1.camera.setView({
                        destination: _camercas.position,
                        orientation: {
                            direction: _camercas._direction,
                            up: _camercas.up,
                            heading: _camercas.heading,
                            pitch: _camercas.pitch,
                            roll: _camercas.roll
                        }
                    });
                }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);

                _self.handler1.setInputAction(function (movement) {
                    var _camercas = that.viewerss.camera;
                    that.viewers1.camera.setView({
                        destination: _camercas.position,
                        orientation: {
                            direction: _camercas._direction,
                            up: _camercas.up,
                            heading: _camercas.heading,
                            pitch: _camercas.pitch,
                            roll: _camercas.roll
                        }
                    });
                }, Cesium.ScreenSpaceEventType.WHEEL);
            },

            onClose: function () {
                //面板关闭的时候触发 （when this panel is closed trigger）

 widgets/Screen/css/style.css

@@ -69,7 +69,7 @@
#sliders1 {
  position: absolute;
  left: 150%;
  top: 0;
  top: 45px;
  background-color: #D3D3D3;
  width: 50%;
  height: 100%;
@@ -79,7 +79,7 @@
#sliders2 {
  position: absolute;
  left: 100%;
  top: 0;
  top: 45px;
  background-color: #D3D3D3;
  width: 50%;
  height: 100%;

 widgets/Screen/manifest.json

@@ -1,5 +1,5 @@
{
  "name": "Rolling",
  "name": "Screen",
  "2D": true,
  "3D": true,
  "platform": "HTML",