Merge branches 'master' and 'master' of http://192.168.0.105:10010/r/pyhmap

shuishen

2021-06-18 bb3721b514c504682b57129c36a5e205f8f50400

Merge branches 'master' and 'master' of http://192.168.0.105:10010/r/pyhmap

 images/addL/ksy.png

 images/addL/pdpx.png

 images/addL/剖面分析.png

 widgets/searchL/Widget.js

@@ -233,15 +233,16 @@
            clickHand: function clickHand(data) {
                var pickedObjects = this.map.scene.drillPick(data.position) || 0;
                // console.log(pickedObjects);
                if (pickedObjects.length != 0 && pickedObjects.id != undefined) {
                if (pickedObjects.length != 0) {
                    var data = pickedObjects[0].primitive.id.onceData[1];

                    if (pickedObjects[0].primitive.id.onceData[0] == 1) {//全景
                        var address = data.panAddress;
                        var dom = $('.header'),
                        var dom = $('.jimu-widget-searchTabaPopup').find('.header'),
                            str = `${data.name}--全景`;
                        dom.empty();
                        dom.append(str);
                        // console.log(data)

                        dom = $('#poput-m-t-quanjing');
                        str = `<iframe id="poput-m-t-quanjing-iframe" src="${address}" frameborder="0"></iframe>`;
@@ -251,10 +252,11 @@
                        $('.jimu-widget-searchTabaPopup').find('.p-main').eq(0).css({ 'display': 'block' }).siblings().css({ 'display': 'none' });
                    }
                    if (pickedObjects[0].primitive.id.onceData[0] == 2) {//监控
                        var dom = $('.header'),
                        var dom = $('.jimu-widget-searchTabaPopup').find('.header'),
                            str = `${data.name}--实时视频`;
                        dom.empty();
                        dom.append(str);
                        // console.log(data)
                        if (data.flv) {
                            dom = $('#poput-m-t-video');
                            str = `

 widgets/spatialAnalysis/Widget.html

@@ -7,6 +7,7 @@
    </div>
    <div class="main">
        <ul id="spatialAnalysis-main">
            <!-- <li class="visibleArea-tool"><i><img src="../../images/addL/ksy.png" alt=""></i> <span>可视分析</span></li> -->
            <!-- <li class="visibleArea-tool"><i></i> <span>可视分析</span></li>
            <li class="profileAnalysis-tool"><i></i> <span>剖面分析</span></li>
            <li class="slope-tool"><i></i> <span>坡度分析</span></li> -->

 widgets/spatialAnalysis/Widget.js

@@ -34,20 +34,25 @@
                var domHtmls = [
                    {
                        name: '可视分析',
                        classs: 'visibleArea-tool'
                        classs: 'visibleArea-tool',
                        img: '../../images/addL/ksy.png'
                    }, {
                        name: '剖面分析',
                        classs: 'profileAnalysis-tool'
                        classs: 'profileAnalysis-tool',
                        img: '../../images/addL/剖面分析.png'
                    }, {
                        name: '坡度分析',
                        classs: 'slope-tool'
                        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>`
                }
@@ -65,15 +70,6 @@
                    $(".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 () {

 widgets/spatialAnalysis/css/style.css

@@ -66,10 +66,31 @@
  padding-top: 12px;
  border: 1px solid rgb(255, 255, 255);
  box-shadow: 2px 2px 15px -5px #39A5FD;
  color: #555
  color: #555;
  display: flex;
  align-items: center;
  justify-content: center;
  flex-direction: column;
}

.jimu-widget-spatialAnalysis li:hover {
  background-color: #ffffff;
  box-shadow: 3px 3px 20px -4px #0b8af1;
}

.jimu-widget-spatialAnalysis .imgs {
  display: block;
  height: 50px;
  width: 50px;
  border-radius: 50%;
  background-color: #39A5FD;
  position: relative;
  top: -8px;
  display: flex;
  align-items: center;
  justify-content: center;
}

.jimu-widget-spatialAnalysis .imgs img {
  width: 40px;
}