解决冲突

liuyg

2021-06-19 66f2854366a59a2194ac51e67e5c6ddc29b20ff3

 widgets/spatialAnalysis/Widget.js

@@ -34,20 +34,26 @@
            var domHtmls = [
               {
                  name: '可视分析',
                  classs: 'visibleArea-tool'
                  classs: 'visibleArea-tool',
                  img: './images/addL/ksy.png'
               }, {
                  name: '剖面分析',
                  classs: 'profileAnalysis-tool'
               }, {
                  name: '坡度分析',
                  classs: 'slope-tool'
                  classs: 'profileAnalysis-tool',
                  img: './images/addL/剖面分析.png'
               }
                    // , {
               //    name: '坡度分析',
               //    classs: 'slope-tool',
               //    img: './images/addL/pdpx.png'
               // }
            ];
            var dom = $('#spatialAnalysis-main');
            var str = '';
            for (var k in domHtmls) {
               str += `<li class="${domHtmls[k].classs}">
                <i></i>
                <i class="imgs">
                <img src="${domHtmls[k].img}" alt="">
                </i>
                <span>${domHtmls[k].name}</span>
                </li>`
            }
@@ -59,19 +65,12 @@
               topic.publish('closev', '');
               // 关闭剖面
               topic.publish('closep', '');
               // 关闭坡度
               topic.publish('closes', '');
               $(".jimu-widget-visibleArea").hide();
               $(".jimu-widget-profileAnalysis").hide();
               $(".jimu-widget-slope").hide();
            })


            // topic.subscribe("closeTool", lang.hitch(this, this.closeToolBox));
            // this.inherited(arguments);
            // $('.tool-bar .tool-btn span').click(function () {
            //    topic.publish('closeMap', this.name);
            //    topic.publish('closeZtree', this.name);
            //    $('.tool-y-box').toggle();
            // })

            // 可视分析
            $('.visibleArea-tool').click(function () {
@@ -91,9 +90,14 @@
               // topic.publish('closev', '');
               // 关闭剖面
               topic.publish('closep', '');
               // 关闭坡度
               topic.publish('closes', '');
               $(".jimu-widget-profileAnalysis").hide();
               $(".jimu-widget-slope").hide();
               $('.tool-y-box').stop().hide();
               //关闭飞行
               $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
               topic.publish('closeFly', 'closeFly');

               $(".jimu-widget-visibleArea").show();
            })
@@ -115,9 +119,14 @@
               topic.publish('closev', '');
               // 关闭剖面
               // topic.publish('closep', '');
               // 关闭坡度
               topic.publish('closes', '');
               $(".jimu-widget-visibleArea").hide();
               $(".jimu-widget-slope").hide();
               $('.tool-y-box').stop().hide();
               //关闭飞行
               $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
               topic.publish('closeFly', 'closeFly');

               $(".jimu-widget-profileAnalysis").show();
            })
@@ -139,13 +148,49 @@
               topic.publish('closev', '');
               // 关闭剖面
               topic.publish('closep', '');
               // 关闭坡度
               // topic.publish('closes', '');
               $(".jimu-widget-visibleArea").hide();
               $(".jimu-widget-profileAnalysis").hide();
               $('.tool-y-box').stop().hide();
               //关闭飞行
               $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
               topic.publish('closeFly', 'closeFly');

               $(".jimu-widget-slope").show();
               topic.publish('getbeginSlope', this.beginSlope);
            })
            //模型
            $('.modelDiagram-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', '');
               // 关闭坡度
               // topic.publish('closes', '');
               $(".jimu-widget-visibleArea").hide();
               $(".jimu-widget-profileAnalysis").hide();
               $('.tool-y-box').stop().hide();
               $(".jimu-widget-slope").hide();
               //关闭飞行
               $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
               topic.publish('closeFly', 'closeFly');

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

         },