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

shuishen

2021-06-08 b435f2b1fc2bc8ad392dfa78aed1a5bc70c8b1e4

 widgets/searchL/Widget.js

@@ -56,94 +56,7 @@
               $('.searchLMain').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();
            // })


            // 查询定位
            // $('.location-tool').click(function () {
            //    $('.jimu-widget-Location').show();
            //    $('.jimu-widget-FlyRoute').hide();
            //    $('.jimu-widget-Sign').hide();
            //    $('.jimu-widget-DynamicRiver').hide();
            //    $('.jimu-widget-Measurement').hide();
            //    $('.tool-y-box').toggle()
            // })


            // 图上量算
            // $('.measure-tool').click(function () {
            //    $('.jimu-widget-Location').hide();
            //    $('.jimu-widget-Measurement').show();
            //    $('.jimu-widget-Sign').hide();
            //    $('.jimu-widget-FlyRoute').hide();
            //    $('.jimu-widget-DynamicRiver').hide();
            //    $('.tool-y-box').toggle()
            // })

            // 我的标记
            // $('.sign-tool').click(function () {
            //    topic.publish('openSign', 'Sign');
            //    $('.jimu-widget-Location').hide();
            //    $('.jimu-widget-Sign').show();
            //    $('.jimu-widget-Measurement').hide();
            //    $('.jimu-widget-FlyRoute').hide();
            //    $('.jimu-widget-DynamicRiver').hide();
            //    $('.tool-y-box').toggle()
            // })

            // 卷帘对比
            // $('.rolling-tool').click(function () {
            //    topic.publish('openRolling', 'Rolling');
            //    $('.jimu-widget-Location').hide();
            //    $('.jimu-widget-Rolling').show();
            //    $('#widgets_Rolling_Widget_17').show();
            //    $('.jimu-widget-Measurement').hide();
            //    $('.jimu-widget-FlyRoute').hide();
            //    $('.jimu-widget-DynamicRiver').hide();
            //    $('.tool-y-box').toggle();
            // })

            // 坐标定位
            // $('.CoorPosition-tool').click(function () {
            //    $('.jimu-widget-CoorPosition').show();
            //    $('.jimu-widget-Location').hide();
            //    $('.jimu-widget-Measurement').hide();
            //    $('.jimu-widget-Sign').hide();
            //    $('.jimu-widget-FlyRoute').hide();
            //    $('.jimu-widget-DynamicRiver').hide();
            //    $('.tool-y-box').toggle()
            // })

            // 地图打印
            // $('.MapPrinting-tool').click(function () {
            //    $('.jimu-widget-Location').hide();
            //    $('.jimu-widget-MapPrinting').show();
            //    $('.jimu-widget-CoorPosition').hide();
            //    $('.jimu-widget-Measurement').hide();
            //    $('.jimu-widget-Sign').hide();
            //    $('.jimu-widget-FlyRoute').hide();
            //    $('.jimu-widget-DynamicRiver').hide();
            //    $('.tool-y-box').toggle()
            // })

            // 路线导航
            // $('.RouteNavigate-tool').click(function () {
            //    $('.jimu-widget-RouteNavigate').show();
            //    $('.jimu-widget-MapPrinting').hide();
            //    $('.jimu-widget-CoorPosition').hide();
            //    $('.jimu-widget-Measurement').hide();
            //    $('.jimu-widget-Sign').hide();
            //    $('.jimu-widget-FlyRoute').hide();
            //    $('.jimu-widget-DynamicRiver').hide();
            //    $('.tool-y-box').toggle()
            // })
			
         },

         closeToolBox: function (item) {
@@ -267,11 +180,11 @@
                     , last: false //不显示尾页
                  }
                  , cols: [[
                     { field: 'id', width: 70, align: 'center', title: '序号' }
                     { field: 'id', width: 59, align: 'center', title: '序号' }
                     , { field: 'username', width: 90, align: 'center', title: '图层名称' }
                     , { field: 'style1', width: 95, align: 'center', title: '图层属性1' }
                     , { field: 'style2', width: 95, align: 'center', title: '图层属性2' }
                     , { fixed: 'right', width: 120, align: 'center', title: '操作', toolbar: '#demoTable' }
                     , { fixed: 'right', width: 115, align: 'center', title: '操作', toolbar: '#demoTable' }
                  ]],
                  data: data,
                  //,skin: 'line' //表格风格