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

liuyg

2021-07-02 25ce610f6ecca7325e7a743dc032c4a76559c63d

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

 config.json

@@ -35,7 +35,7 @@
      {
        "uri": "widgets/Tool/Widget",
        "position": {
          "right": 82,
          "right": 262,
          "top": 20,
          "height": "36px",
          "width": "86px",
@@ -45,7 +45,7 @@
      {
        "uri": "widgets/Basemap/Widget",
        "position": {
          "right": 10,
          "right": 190,
          "top": 20,
          "height": "36px",
          "width": "72px",
@@ -191,7 +191,7 @@
        "name": "视角底部按钮",
        "uri": "widgets/visualAngle/Widget",
        "position": {
          "right": 168,
          "right": 348,
          "top": 20,
          "height": "36px",
          "width": "142px",

 images/图层管理.png

 images/目录树.png

 widgets/Basemap/Widget.js

@@ -38,6 +38,12 @@
                $('.jimu-widget-Basemap span').click(function () {
                    topic.publish('closeTool', this.name);
                    topic.publish('closeZtree', this.name);
                    topic.publish('closeNavigation', this.name);
                    $(".jimu-widget-Layermanagement .layer-list").stop().hide();

                    if ($(".jimu-widget-Layermanagement .layer-list").is(":hidden")) {
                        $(".jimu-widget-Layermanagement .tree-layer-opcity").stop().hide();
                    }
                    if ($('.cesium-baseLayerPicker-dropDown').hasClass('cesium-baseLayerPicker-dropDown-visible') == true) {
                        $('.cesium-baseLayerPicker-dropDown').removeClass('cesium-baseLayerPicker-dropDown-visible')
                    } else {

 widgets/Basemap/css/style.css

@@ -6,19 +6,26 @@
  width: 100%;
  background: rgb(254, 254, 254);
  color: #838383;
  border-radius: 0 6px 6px 0;
  
  text-align: center;
  cursor: pointer;
  z-index: 10 !important;
}

.jimu-widget-Basemap .base-map {
  width: 100%;
  display: flex;
  align-items: center;
  justify-content: center;
}

.jimu-widget-Basemap .base-map {

  width: 100%;
  height: 24px;
  display: flex;
  align-items: center;
  justify-content: center;
  border-right: 1px solid #DDDDDD;

}

.jimu-widget-Basemap .base-map i {
  display: inline-block;
  margin-right: 4px;

 widgets/FlyRoute/fly.js

@@ -308,7 +308,14 @@
            p = that.allSites[l + 1].pitch - that.allSites[l].pitch;
            h = that.allSites[l + 1].heading - that.allSites[l].heading;





            var tem = Cesium.Math.toDegrees(that.allSites[l + 1].heading) - Cesium.Math.toDegrees(that.allSites[l].heading);



            if (Math.abs(tem) > 180) {
                if (tem >= 0) {
                    tem = 360 - tem;
@@ -317,8 +324,13 @@
                }
                h = Cesium.Math.toRadians(tem);
            }


            //that.b=that.allSites[l].time*20
            that.setInterval_fly = setInterval(that.setcamera, 20);


            
        } else {
            that.play_bool = true;
            that.l = 0;

 widgets/FlyRoute/flyroute.json

@@ -1,5 +1,4 @@
[
    {
[{
        "name": "鄱阳湖国家级保护区倾斜飞行路线1",
        "sites": [{
            "id": 0,
@@ -51,5 +50,158 @@
            "roll": 0,
            "time": 0
        }]
    },
    {
        "name": "五星白鹤保护区倾斜飞行路线",
        "sites": [{
                "id": 0,
                "lgtd": 116.296646,
                "lttd": 28.735445,
                "height": 60.00,
                "heading": 38.62,
                "pitch": -15.00,
                "roll": 360.00,
                "time": 15
            }, {
                "id": 1,
                "lgtd": 116.316991,
                "lttd": 28.746756,
                "height": 60.00,
                "heading": 11.20,
                "pitch": -15.00,
                "roll": 360.00,
                "time": 9
            },
            {
                "id": 2,
                "lgtd": 116.317868,
                "lttd": 28.757318,
                "height": 60.00,
                "heading": -18.00,
                "pitch": -15.00,
                "roll": 360.00,
                "time": 10
            }, {
                "id": 3,
                "lgtd": 116.315890,
                "lttd": 28.770270,
                "height": 60.00,
                "heading": -42.25,
                "pitch": -15.00,
                "roll": 360.00,
                "time": 12
    }
]
    },
    {
        "name": "东鄱阳湖湿地公园倾斜飞行路线",
        "sites": [{
            "id": 0,
            "lgtd": 116.559264,
            "lttd": 29.080982,
            "height": 500.00,
            "heading": 340.00,
            "pitch": -26.00,
            "roll": 0,
            "time": 22
        }, {
            "id": 1,
            "lgtd": 116.508000,
            "lttd": 29.133462,
            "height": 500.00,
            "heading": 341.41,
            "pitch": -34.71,
            "roll": 0,
            "time": 0
        }]
    },
    {
        "name": "都昌候鸟保护区倾斜飞行路线1",
        "sites": [{
            "id": 0,
            "lgtd": 116.296478,
            "lttd": 29.118665,
            "height": 379.47,
            "heading": 20.70,
            "pitch": -22.85,
            "roll": 0,
            "time": 20
        }, {
            "id": 1,
            "lgtd": 116.300000,
            "lttd": 29.160133,
            "height": 150.00,
            "heading": 20.00,
            "pitch": -23.00,
            "roll": 0,
            "time": 0
        }]
    },
    {
        "name": "都昌候鸟保护区倾斜飞行路线2",
        "sites": [{
            "id": 0,
            "lgtd": 116.323711,
            "lttd": 29.115406,
            "height": 800.00,
            "heading": 335.00,
            "pitch": -26.12,
            "roll": 0,
            "time": 14
        }, {
            "id": 1,
            "lgtd": 116.304094,
            "lttd": 29.156029,
            "height": 303.59,
            "heading": 335.00,
            "pitch": -21.43,
            "roll": 0,
            "time": 0
        }]
    },
    {
        "name": "南矶山保护区倾斜飞行路线1",
        "sites": [{
            "id": 0,
            "lgtd": 116.294604,
            "lttd": 28.892321,
            "height": 658.39,
            "heading": 33.53,
            "pitch": -25.65,
            "roll": 0,
            "time": 30
        }, {
            "id": 1,
            "lgtd": 116.350689,
            "lttd": 28.958424,
            "height": 300.00,
            "heading": 59.72,
            "pitch": -19.43,
            "roll": 0,
            "time": 0
        }]
    },
    {
        "name": "南矶山保护区倾斜飞行路线2",
        "sites": [{
            "id": 0,
            "lgtd": 116.354654,
            "lttd": 28.941695,
            "height": 100.00,
            "heading": 332.00,
            "pitch": -15.81,
            "roll": 0,
            "time": 30
        }, {
            "id": 1,
            "lgtd": 116.336091,
            "lttd": 28.966149,
            "height": 100.00,
            "heading": 332.00,
            "pitch": -15.81,
            "roll": 0,
            "time": 0
        }]
    }

]

 widgets/Layermanagement/Widget.html

@@ -1,8 +1,15 @@
<div>
    <div class='layer-tab'>
    <!-- <div class='layer-tab'>
        <button title='图层管理'>
            <img src='./images/layer-control.png' alt=''>
        </button>
    </div> -->

    <div class="layer-tab">
        <div>
            <i></i>
            <div class="v-a-o-title">图层管理</div>
        </div>
    </div>

    <div class='layer-list'>

 widgets/Layermanagement/Widget.js

@@ -38,7 +38,10 @@
                topic.subscribe("appendTilt", lang.hitch(this, this.appendTilt));
                topic.subscribe("removeTilt", lang.hitch(this, this.removeTilt));

                $(".jimu-widget-Layermanagement .layer-tab button").click(function () {
                $(".jimu-widget-Layermanagement .layer-tab>div").click(function () {
                    topic.publish('closeTool', this.name);
                    topic.publish('closeMap', this.name);
                    topic.publish('closeNavigation', this.name);
                    $(".jimu-widget-Layermanagement .layer-list").stop().toggle();

                    if ($(".jimu-widget-Layermanagement .layer-list").is(":hidden")) {

 widgets/Layermanagement/css/style.css

@@ -4,44 +4,54 @@

.jimu-widget-Layermanagement .layer-tab {
    position: fixed;
    top: 112px;
    right: 10px;
}

.jimu-widget-Layermanagement .layer-tab button {
    background: #fff;
    box-shadow: 0 0 8px #fff;
    width: 32px;
    height: 32px;
    border-radius: 14%;
    padding: 0;
    vertical-align: middle;
    z-index: 0;
    box-sizing: border-box;
    display: inline-block;
    position: relative;
    border: 1px solid #444;
    border-color: #fff;
    fill: #edffff;
    margin: 1px 2px;
    top: 20px;
    right: 100px;
    z-index: 16 !important;
    width: 90px;
    height: 36px;
    line-height: 36px;
    display: flex;
    align-items: center;
    justify-content: center;
    cursor: pointer;
    overflow: hidden;
    user-select: none;
    background: rgba(254, 254, 254, 1);
    font-size: 14px;
}

.jimu-widget-Layermanagement .layer-tab button:focus {
    outline: none !important;
.jimu-widget-Layermanagement .layer-tab>div {
    width: 100%;
    height: 24px;
    border-right: 1px solid #DDDDDD;
    display: flex;
    align-items: center;
    justify-content: center;
    cursor: pointer;
}

.jimu-widget-Layermanagement .layer-tab button img {
    width: 20px;
.jimu-widget-Layermanagement .layer-tab:hover .v-a-o-title {
    text-decoration: underline;
}

.jimu-widget-Layermanagement .layer-tab .v-a-o-title {
    color: #838383 !important;
    position: relative;
    left: 3px;
}

.jimu-widget-Layermanagement .layer-tab i {
    width: 14px;
    height: 14px;
    margin-right: 4px;
    vertical-align: middle;
    background: url(../../../images/图层管理.png) no-repeat;
    background-size: 100% 100%;
}

.jimu-widget-Layermanagement .layer-list {
    display: none;
    position: fixed;
    top: 112px;
    right: 60px;
    top: 66px;
    right: 10px;
    width: 320px;
    min-height: 80px;
    background: #fff;
@@ -107,8 +117,8 @@
.jimu-widget-Layermanagement .tree-layer-opcity {
    display: none;
    position: fixed;
    top: 72px;
    right: 390px;
    top: 66px;
    right: 340px;
    width: 260px;
    height: auto;
    background: #Fff;

 widgets/LeftNavigationBar/Widget.html

@@ -2,9 +2,18 @@
    <!-- <div class="left-navigation-bar-but">
        <img class="l-n-b-b-img" src="./images/addL/xzuo.png" alt="">
    </div> -->
    <div class="left-navigation-bar-but">
    <!-- <div class="left-navigation-bar-but" title="图层目录">
        <img class="l-n-b-b-img" src="./images/addL/目录树.png" alt="">
    </div> -->

    <div class="left-navigation-bar-but">
        <div>
            <i></i>
            <div class="v-a-o-title">图层目录</div>
    </div>
    </div>


    <div class="left-navigation-bar-main">
        <!-- <ul id="treeDemo" class="ztree"></ul> -->
        <div class="l-n-b-m-search">

 widgets/LeftNavigationBar/Widget.js

@@ -33,7 +33,7 @@
                // this.begin(this.data);
                var that = this;
                this.getData();

                topic.subscribe("closeNavigation", lang.hitch(this, this.closeNavigation));
                // $('.left-navigation-bar-but').click(() => {
                //     this.changeImg = !this.changeImg;
                //     if (this.changeImg) {
@@ -54,84 +54,39 @@
                //         });
                //     }
                // })
                var time = null;
                $('.left-navigation-bar-but').click(() => {
                    this.changeImg = !this.changeImg;
                    if (this.changeImg) {
                        if (time != null) {
                            clearTimeout(time);
                            time = null;
                $('.left-navigation-bar-but>div').click(() => {
                    topic.publish('closeTool', this.name);
                    topic.publish('closeMap', this.name);
                    $(".jimu-widget-Layermanagement .layer-list").stop().hide();

                    if ($(".jimu-widget-Layermanagement .layer-list").is(":hidden")) {
                        $(".jimu-widget-Layermanagement .tree-layer-opcity").stop().hide();
                        }
                        // $('.l-n-b-b-img').attr("src", "./images/addL/xzuo.png"); //打开
                        $('.left-navigation-bar-main').css({
                            'display': 'block',

                    if ($('.left-navigation-bar-main').is(":hidden")) {
                        $('.left-navigation-bar-main').stop().css({
                            'width': '300px',
                            'padding': '10px',
                            'height': 'auto',
                        });
                        $('.l-n-b-m-search').css({
                            'display': 'flex',
                        })
                        $('#left-tree-list').css({
                            'display': 'block',
                        })
                            'height': 'auto'
                        }).show();


                    } else {
                        // $('.l-n-b-b-img').attr("src", "./images/addL/xyou.png"); //关闭
                        $('.l-n-b-m-search').css({
                            'display': 'none',
                        })
                        $('#left-tree-list').css({
                            'display': 'none',
                        })
                        $('.left-navigation-bar-main').css({
                        $('.left-navigation-bar-main').stop().css({
                            'width': '0px',
                            'padding': '0px',
                            'height': '0px',
                        });
                        if (time != null) {
                            clearTimeout(time);
                            time = null;
                        }).hide();
                        }
                        time = setTimeout(() => {
                            $('.left-navigation-bar-main').css({
                                'display': 'none'
                            });
                            clearTimeout(time);
                            time = null;
                        }, 500);
                    }

                })
                $('#l-n-b-m-search-closeOUR').click(() => {
                    this.changeImg = !this.changeImg;
                    if (!this.changeImg) {
                        if (time != null) {
                            clearTimeout(time);
                            time = null;
                        }
                        $('.l-n-b-m-search').css({
                            'display': 'none',
                        })
                        $('#left-tree-list').css({
                            'display': 'none',
                        })
                        $('.left-navigation-bar-main').css({

                    $('.left-navigation-bar-main').stop().css({
                            'width': '0px',
                            'padding': '0px',
                            'height': '0px',
                        });
                        if (time != null) {
                            clearTimeout(time);
                            time = null;
                        }
                        time = setTimeout(() => {
                            $('.left-navigation-bar-main').css({
                                'display': 'none'
                            });
                            clearTimeout(time);
                            time = null;
                        }, 500);
                    }
                    }).hide();
                })


@@ -238,7 +193,19 @@
                }
            },

            closeToolBox: function (item) { },
            closeNavigation: function (item) {
                if (item != this.name) {

                    if (!$('.left-navigation-bar-main').is(":hidden")) {
                        $('.left-navigation-bar-main').stop().css({
                            'width': '0px',
                            'padding': '0px',
                            'height': '0px',
                        }).hide();
                    }

                }
            },

            onOpen: function () {
                //面板打开的时候触发 （when open this panel trigger）

 widgets/LeftNavigationBar/css/style.css

@@ -46,32 +46,49 @@
}*/

.jimu-widget-LeftNavigationBar .left-navigation-bar-but {
  background: #fff;
  box-shadow: 0 0 8px #fff;
  width: 32px;
  height: 32px;
  border-radius: 14%;
  padding: 0;
  vertical-align: middle;
  z-index: 0;
  box-sizing: border-box;
  display: inline-block;
  position: fixed;
  border: 1px solid #444;
  border-color: #fff;
  fill: #edffff;
  margin: 1px 2px;
  cursor: pointer;
  overflow: hidden;
  user-select: none;
  top: 72px;
  /* left: 10px; */
    top: 20px;
  right: 10px;
  z-index: 16 !important;
    width: 90px;
    height: 36px;
    line-height: 36px;
    display: flex;
    align-items: center;
    justify-content: center;
    cursor: pointer;
    background: rgba(254, 254, 254, 1);
    font-size: 14px;
    border-radius: 0 6px 6px 0;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-but img {
  width: 30px;
.jimu-widget-LeftNavigationBar .left-navigation-bar-but>div {
    width: 100%;
    height: 24px;
    border-right: 1px solid #DDDDDD;
    display: flex;
    align-items: center;
    justify-content: center;
    cursor: pointer;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-but:hover .v-a-o-title {
    text-decoration: underline;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-but .v-a-o-title {
    color: #838383 !important;
    position: relative;
    left: 3px;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-but i {
    width: 14px;
    height: 14px;
    margin-right: 4px;
    vertical-align: middle;
    background: url(../../../images/目录树.png) no-repeat;
    background-size: 100% 100%;
}

.jimu-widget-LeftNavigationBar #l-n-b-m-search-closeOUR {
@@ -87,6 +104,7 @@
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main {
    display: none;
  position: fixed;
  width: 0px;
  height: 0px;
@@ -95,15 +113,14 @@
  padding: 0px;
  background-color: #fff;
  z-index: 15 !important;
  top: 72px;
    top: 66px;
  /* left: 10px; */
  right: 60px;
    right: 10px;
  /* top: 72px; */
  /* left: 60px; */
  border-radius: 5px;
  box-shadow: 0 0 8px #fff;
  /* transition: all 0.5s; */
  display: none;
  /* border: 1px saddlebrown solid; */
}


 widgets/MapPrinting/Widget.html

@@ -2,12 +2,12 @@
    <div class="MapPrinting-flex">
        <div class="MapPrinting-left">
            <!-- <span class="MapPrinting-left-pic"></span> -->
            <img class="MapPrinting-pic" src="../../images/newImages/储存.png" alt="">
            <img class="MapPrinting-pic" src="./images/newImages/储存.png" alt="">
            <span class="MapPrinting-left-cunwei">存为图片</span>
        </div>
        <div class="MapPrinting-right">
            <!-- <span class="MapPrinting-right-pic"></span> -->
            <img class="MapPrinting-pic" src="../../images/newImages/打印.png" alt="">
            <img class="MapPrinting-pic" src="./images/newImages/打印.png" alt="">
            <span class="MapPrinting-right-dayin">打印</span>
        </div>
        <span class="MapPrinting-flex-x">

 widgets/ShowPosition/css/style.css

@@ -1,8 +1,9 @@
.jimu-widget-ShowPosition{
    padding: 0 10px !important;
  position: relative;
  font-size: 12px;
  line-height: 25px;
  width: 695px !important;
    width: auto !important;
  background: rgba(38, 38, 38, 0.75);
  color: #fff;
  z-index: 3 !important;
@@ -12,15 +13,18 @@
  float: right;
  height: 100%;
}

.jimu-widget-ShowPosition .right {
  position: absolute;
  left: 8px; 
}

.jimu-widget-ShowPosition .right a {
  padding: 0 2px;
  color: #fff;
  text-decoration: none;
}

.jimu-widget-ShowPosition p {
  margin: 0;
  padding: 0;

 widgets/Tool/Widget.js

@@ -35,6 +35,12 @@
                $('.tool-bar .tool-btn span').click(function () {
                    topic.publish('closeMap', this.name);
                    topic.publish('closeZtree', this.name);
                    topic.publish('closeNavigation', this.name);
                    $(".jimu-widget-Layermanagement .layer-list").stop().hide();

                    if ($(".jimu-widget-Layermanagement .layer-list").is(":hidden")) {
                        $(".jimu-widget-Layermanagement .tree-layer-opcity").stop().hide();
                    }
                    $('.tool-y-box').toggle();
                })


 widgets/instructions/css/style.css

@@ -1,13 +1,13 @@
.jimu-widget-instructions {
  position: absolute !important;
  font-size: 14px;
  height: 42px !important;
  line-height: 42px;
    height: 36px !important;
    line-height: 36px;
  /* min-width: 160px !important; */
  right: auto !important;
  bottom: auto !important;
  left: 10px !important;
  top: 72px !important;
    top: 20px !important;
  /* 240px */
  background: rgba(255, 255, 255, 1);
  color: #fff;
@@ -17,7 +17,6 @@
  /* cursor       : pointer; */
  z-index: 15 !important;
  box-sizing: border-box;
  padding: 0 20px 0 20px;
  /* padding: 0 20px 0 20px!important; */
  /* display: flex; */
  /*align-items: center;