Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

shuishen

2021-06-23 9dd06fefff5262947d42e99f518706d4a068d654

 widgets/Tool/Widget.js

@@ -51,8 +51,8 @@
               $('.jimu-widget-Sign').hide();
               $('.jimu-widget-CoorPosition').hide();
               $('.jimu-widget-MapPrinting').hide();
				
					


               that.closefenxi();


@@ -83,8 +83,8 @@
                        
               $('.jimu-widget-CoorPosition').hide();
               $('.jimu-widget-MapPrinting').hide();
					
					


               that.closefenxi();


@@ -110,8 +110,8 @@
               topic.publish('closeFlyRoute', 'FlyRoute');
               $('.jimu-widget-CoorPosition').hide();
               $('.jimu-widget-MapPrinting').hide();
				
					


               that.closefenxi();


@@ -137,8 +137,8 @@
               topic.publish('closeFlyRoute', 'FlyRoute');
               $('.jimu-widget-CoorPosition').hide();
               $('.jimu-widget-MapPrinting').hide();
					
					


               that.closefenxi();


@@ -166,8 +166,8 @@
               topic.publish('closeSign', 'Sign');
               topic.publish('closeFlyRoute', 'FlyRoute');
               $('.jimu-widget-MapPrinting').hide();
					
					


               that.closefenxi();


@@ -198,8 +198,8 @@
               topic.publish('closeFlyRoute', 'FlyRoute');

               $('.jimu-widget-CoorPosition').hide();
					
					


               that.closefenxi();


@@ -239,80 +239,6 @@
               $(".jimu-widget-spatialAnalysis").show();
            })

            // // 可视分析
            // $('.visibleArea-tool').click(function () {
            //    that.map.scene.globe.depthTestAgainstTerrain = true;
            //    // 关闭量算
            //    topic.publish('closeMeasurement', 'Measurement');
            //    // 关闭卷帘
            //    topic.publish('closeRolling', 'Rolling');
            //    // 关闭分屏
            //    topic.publish('closeSplitScreen', 'SplitScreen');
            //    // 关闭标记
            //    topic.publish('closeSign', 'Sign');
            //    topic.publish('closeFlyRoute', 'FlyRoute');
            //    $('.jimu-widget-CoorPosition').hide();
            //    $('.jimu-widget-MapPrinting').hide();
            //    // 关闭可视
            //    // topic.publish('closev', '');
            //    // 关闭剖面
            //    topic.publish('closep', '');
            //    $(".jimu-widget-profileAnalysis").hide();
            //    $(".jimu-widget-slope").hide();
            //    $('.tool-y-box').stop().hide();

            //    $(".jimu-widget-visibleArea").show();
            // })
            // 剖面分析
            // $('.profileAnalysis-tool').click(function () {
            //    that.map.scene.globe.depthTestAgainstTerrain = true;
            //    // 关闭量算
            //    topic.publish('closeMeasurement', 'Measurement');
            //    // 关闭卷帘
            //    topic.publish('closeRolling', 'Rolling');
            //    // 关闭分屏
            //    topic.publish('closeSplitScreen', 'SplitScreen');
            //    // 关闭标记
            //    topic.publish('closeSign', 'Sign');
            //    topic.publish('closeFlyRoute', 'FlyRoute');
            //    $('.jimu-widget-CoorPosition').hide();
            //    $('.jimu-widget-MapPrinting').hide();
            //    // 关闭可视
            //    topic.publish('closev', '');
            //    // 关闭剖面
            //    // topic.publish('closep', '');
            //    $(".jimu-widget-visibleArea").hide();
            //    $(".jimu-widget-slope").hide();
            //    $('.tool-y-box').stop().hide();

            //    $(".jimu-widget-profileAnalysis").show();
            // })
            //坡度分析
            // $('.slope-tool').click(function () {
            //    that.map.scene.globe.depthTestAgainstTerrain = true;
            //    // 关闭量算
            //    topic.publish('closeMeasurement', 'Measurement');
            //    // 关闭卷帘
            //    topic.publish('closeRolling', 'Rolling');
            //    // 关闭分屏
            //    topic.publish('closeSplitScreen', 'SplitScreen');
            //    // 关闭标记
            //    topic.publish('closeSign', 'Sign');
            //    topic.publish('closeFlyRoute', 'FlyRoute');
            //    $('.jimu-widget-CoorPosition').hide();
            //    $('.jimu-widget-MapPrinting').hide();
            //    // 关闭可视
            //    topic.publish('closev', '');
            //    // 关闭剖面
            //    topic.publish('closep', '');
            //    $(".jimu-widget-visibleArea").hide();
            //    $(".jimu-widget-profileAnalysis").hide();
            //    $('.tool-y-box').stop().hide();

            //    $(".jimu-widget-slope").show();
            //    topic.publish('getbeginSlope', this.beginSlope);
            // })

         },

         closeToolBox: function (item) {
@@ -321,19 +247,11 @@
            }
         },
         closefenxi: function () {
            // 关闭可视
            topic.publish('closev', '');
            // 关闭剖面
            topic.publish('closep', '');
            // 关闭坡度
            topic.publish('closes', '');
            $(".jimu-widget-profileAnalysis").hide();
            $(".jimu-widget-slope").hide();
            $(".jimu-widget-visibleArea").hide();
            // 关闭空间分析页面
            $(".jimu-widget-spatialAnalysis").hide();
            //清除实体
            this.map.entities.removeAll();
            $(".jimu-widget-modelDiagram").hide();
            // 关闭空间分析子元素
            topic.publish('closeOnceUse');


         },
         onOpen: function () {