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> -->

    <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

@@ -3,16 +3,16 @@
// 模块描述:显示坐标
///////////////////////////////////////////////////////////////////////////
define([
    'dojo/_base/declare',
    'dojo/_base/lang',
    'dojo/_base/array',
    'dojo/_base/html',
    'dojo/topic',
    'jimu/BaseWidget',
    'jimu/utils',
    'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
    'libs/zTree_v3/js/jquery.ztree.all'
],
        'dojo/_base/declare',
        'dojo/_base/lang',
        'dojo/_base/array',
        'dojo/_base/html',
        'dojo/topic',
        'jimu/BaseWidget',
        'jimu/utils',
        'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
        'libs/zTree_v3/js/jquery.ztree.all'
    ],
    function (declare,
        lang,
        array,
@@ -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;
                        }
                        // $('.l-n-b-b-img').attr("src", "./images/addL/xzuo.png"); //打开
                        $('.left-navigation-bar-main').css({
                            'display': 'block',
                $('.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();
                    }

                    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;
                        }
                        time = setTimeout(() => {
                            $('.left-navigation-bar-main').css({
                                'display': 'none'
                            });
                            clearTimeout(time);
                            time = null;
                        }, 500);
                        }).hide();
                    }

                })
                $('#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({
                            '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);
                    }

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


@@ -181,13 +136,13 @@
                    var val = $('#left-navigation-bar-main-input').val();
                    if (val != '') {
                        var clearOur = () => {
                            let dom = $(`[data-id]`);
                            dom.removeClass('layui-tree-spread');
                            let domDiv = dom.find('.layui-tree-pack');
                            domDiv.css({
                                'display': 'none'
                            })
                        },
                                let dom = $(`[data-id]`);
                                dom.removeClass('layui-tree-spread');
                                let domDiv = dom.find('.layui-tree-pack');
                                domDiv.css({
                                    'display': 'none'
                                })
                            },
                            a, useit = (d) => {
                                for (var k in d) {
                                    if (d[k].who == 'father') {
@@ -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）
@@ -410,7 +377,7 @@
            },
            begin: function (data) {
                var that = this;
                window.mySanweiShujuOpens = {};//全局scene.open资源
                window.mySanweiShujuOpens = {}; //全局scene.open资源
                var a = null;

                layui.use(function () {
@@ -422,7 +389,7 @@

                    tree.render({
                        elem: '#left-tree-list' //默认是点击节点可进行收缩
                        ,
                            ,
                        data: data,
                        id: 'demoId1',
                        showCheckbox: true, //是否显示复选框
@@ -786,15 +753,15 @@
                title: '采集站点',
                id: 1,
                field: '1'
                // , checked: true
                ,
                    // , checked: true
                    ,
                spread: true,
                children: [{
                    title: '南矶山保护区',
                    id: 11,
                    field: '1-1'
                    // , checked: true
                    ,
                        // , checked: true
                        ,
                    spread: true,
                    children: [{
                        title: '北深渊',

 widgets/LeftNavigationBar/css/style.css

@@ -1,30 +1,30 @@
.jimu-widget-LeftNavigationBar {
  position: absolute !important;
  /* font-size: 14px; */
  height: 0 !important;
  /* height: calc(100%) !important; */
  width: 0 !important;
  right: auto !important;
  bottom: auto !important;
  /* left: -250px !important; */
  left: 0;
  top: 0 !important;
  /* 240px */
  background: rgba(255, 255, 255, 1);
  color: #000;
  /* border : 1px solid rgba(0, 0, 0, 0.3); */
  border-radius: 6px 6px 6px 6px;
  /* text-align   : center; */
  /* cursor       : pointer; */
  /* z-index: -10 !important; */
  box-sizing: border-box;
  /* padding: 0 20px 0 20px!important; */
  /* display: flex;
    position: absolute !important;
    /* font-size: 14px; */
    height: 0 !important;
    /* height: calc(100%) !important; */
    width: 0 !important;
    right: auto !important;
    bottom: auto !important;
    /* left: -250px !important; */
    left: 0;
    top: 0 !important;
    /* 240px */
    background: rgba(255, 255, 255, 1);
    color: #000;
    /* border : 1px solid rgba(0, 0, 0, 0.3); */
    border-radius: 6px 6px 6px 6px;
    /* text-align   : center; */
    /* cursor       : pointer; */
    /* z-index: -10 !important; */
    box-sizing: border-box;
    /* padding: 0 20px 0 20px!important; */
    /* display: flex;
  align-items: center;
  justify-content: center; */
  box-shadow: 5px 5px 13px -10px rgba(0, 0, 0, .5);
  transition: all 0.5s;
  /* display: none; */
    box-shadow: 5px 5px 13px -10px rgba(0, 0, 0, .5);
    transition: all 0.5s;
    /* display: none; */
}

/* 
@@ -46,172 +46,189 @@
}*/

.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; */
  right: 10px;
  z-index: 16 !important;
    position: fixed;
    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 {
  position: absolute;
  right: 5px;
  top: 5px;
  cursor: pointer;
  font-size: 18px;
    position: absolute;
    right: 5px;
    top: 5px;
    cursor: pointer;
    font-size: 18px;
}

.jimu-widget-LeftNavigationBar #l-n-b-m-search-closeOUR:hover {
  color: red;
    color: red;
}

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

.jimu-widget-LeftNavigationBar .left-navigation-bar-main .l-n-b-m-search {
  /* position: relative; */
  /* top: 16px; */
  width: calc(100% - 30px);
  margin: 0 0 20px 10px;
  height: 40px;
  /* padding: 10px; */
  border: 1px rgba(0, 0, 0, .2) solid;
  border-radius: 5px;
  display: flex;
  align-items: center;
  justify-content: center;
    /* position: relative; */
    /* top: 16px; */
    width: calc(100% - 30px);
    margin: 0 0 20px 10px;
    height: 40px;
    /* padding: 10px; */
    border: 1px rgba(0, 0, 0, .2) solid;
    border-radius: 5px;
    display: flex;
    align-items: center;
    justify-content: center;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main .l-n-b-m-search input {
  border: none;
  width: calc(90% - 50px);
  height: 30px;
    border: none;
    width: calc(90% - 50px);
    height: 30px;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main .l-n-b-m-search img {
  width: 35px;
  cursor: pointer;
  z-index: 18;
    width: 35px;
    cursor: pointer;
    z-index: 18;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main .l-n-b-m-search input::-webkit-input-placeholder {
  color: #afafaf;
  font-size: 14px;
    color: #afafaf;
    font-size: 14px;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main .l-n-b-m-search input::-moz-placeholder {
  /* Mozilla Firefox 19+ */
  color: #afafaf;
  font-size: 14px;
    /* Mozilla Firefox 19+ */
    color: #afafaf;
    font-size: 14px;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main .l-n-b-m-search input:-moz-placeholder {
  /* Mozilla Firefox 4 to 18 */
  color: #afafaf;
  font-size: 14px;
    /* Mozilla Firefox 4 to 18 */
    color: #afafaf;
    font-size: 14px;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main .l-n-b-m-search input::-ms-input-placeholder {
  color: #afafaf;
  font-size: 14px;
    color: #afafaf;
    font-size: 14px;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main #left-tree-list {
  /* position: relative; */
  /* top: 72px; */
  width: calc(100% - 20px);
  /* height: calc(100% - 82px); */
  margin: 0 0 5px 10px;
  max-height: 300px;
  overflow-y: auto;
  overflow-x: hidden;
  /* border: 1px saddlebrown solid; */
    /* position: relative; */
    /* top: 72px; */
    width: calc(100% - 20px);
    /* height: calc(100% - 82px); */
    margin: 0 0 5px 10px;
    max-height: 300px;
    overflow-y: auto;
    overflow-x: hidden;
    /* border: 1px saddlebrown solid; */
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main #test1 {
  height: calc(100% - 58px);
  overflow: auto;
    height: calc(100% - 58px);
    overflow: auto;
}

.jimu-widget-LeftNavigationBar .left-navigation-bar-main .layui-tree-entry {
  height: auto !important;
    height: auto !important;
}

.left-navigation-bar-main-down:after {
  content: "";
  position: absolute;
  left: 4px;
  top: 3px;
  z-index: 100;
  width: 0;
  height: 0;
  border-width: 5px;
  border-style: solid;
  border-color: transparent transparent transparent #c0c4cc;
  /* border-color: #c0c4cc transparent transparent transparent; */
  transform: rotate(90deg);
  transition: .5s;
    content: "";
    position: absolute;
    left: 4px;
    top: 3px;
    z-index: 100;
    width: 0;
    height: 0;
    border-width: 5px;
    border-style: solid;
    border-color: transparent transparent transparent #c0c4cc;
    /* border-color: #c0c4cc transparent transparent transparent; */
    transform: rotate(90deg);
    transition: .5s;
}

.left-navigation-bar-main-current {
  background-color: #2ab9ec
    background-color: #2ab9ec
}

.layui-form-checked[lay-skin=primary] i {
  background-color: #36A0FD !important;
    background-color: #36A0FD !important;
}

.layui-tree-spread .layui-tree-iconArrow:after {
  border-color: #c0c4cc transparent transparent transparent !important;
    border-color: #c0c4cc transparent transparent transparent !important;
}

.jimu-widget-LeftNavigationBar .layui-tree-main {
  width: calc(100% - 22px);
  padding: 0;
    width: calc(100% - 22px);
    padding: 0;
}

.jimu-widget-LeftNavigationBar .layui-tree-txt {
  width: calc(100% - 28px);
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
    width: calc(100% - 28px);
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
}

 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,29 +1,33 @@
.jimu-widget-ShowPosition{
  position: relative;
  font-size: 12px;
  line-height: 25px;
  width: 695px !important;
  background: rgba(38, 38, 38, 0.75);
  color: #fff;
  z-index: 3 !important;
.jimu-widget-ShowPosition {
    padding: 0 10px !important;
    position: relative;
    font-size: 12px;
    line-height: 25px;
    width: auto !important;
    background: rgba(38, 38, 38, 0.75);
    color: #fff;
    z-index: 3 !important;
}

.jimu-widget-ShowPosition div{
  float: right;
  height: 100%;
.jimu-widget-ShowPosition div {
    float: right;
    height: 100%;
}

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

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

.jimu-widget-ShowPosition p {
  margin: 0;
  padding: 0;
  height: 100%;
  line-height: 25px;
    margin: 0;
    padding: 0;
    height: 100%;
    line-height: 25px;
}

 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,48 +1,47 @@
.jimu-widget-instructions {
  position: absolute !important;
  font-size: 14px;
  height: 42px !important;
  line-height: 42px;
  /* min-width: 160px !important; */
  right: auto !important;
  bottom: auto !important;
  left: 10px !important;
  top: 72px !important;
  /* 240px */
  background: rgba(255, 255, 255, 1);
  color: #fff;
  /* border : 1px solid rgba(0, 0, 0, 0.3); */
  border-radius: 8px;
  /* text-align   : center; */
  /* 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;
    position: absolute !important;
    font-size: 14px;
    height: 36px !important;
    line-height: 36px;
    /* min-width: 160px !important; */
    right: auto !important;
    bottom: auto !important;
    left: 10px !important;
    top: 20px !important;
    /* 240px */
    background: rgba(255, 255, 255, 1);
    color: #fff;
    /* border : 1px solid rgba(0, 0, 0, 0.3); */
    border-radius: 8px;
    /* text-align   : center; */
    /* cursor       : pointer; */
    z-index: 15 !important;  
    box-sizing: border-box;
    /* padding: 0 20px 0 20px!important; */
    /* display: flex; */
    /*align-items: center;
  justify-content: center; */
  transition: all 0.5s;
  cursor: pointer;
    transition: all 0.5s;
    cursor: pointer;
}

.jimu-widget-instructions img {
  width: 20px;
  position: relative;
  top: -2px;
  left: -5px;
  margin-left: 11px;
    width: 20px;
    position: relative;
    top: -2px;
    left: -5px;
    margin-left: 11px;
}

.jimu-widget-instructions .instructions-title {
  color: #5AA9FB;
  font-size: 1rem;
  font-weight: 400;
  letter-spacing: 1.5px;
  display: inline-block;
  margin-right: 11px;
    color: #5AA9FB;
    font-size: 1rem;
    font-weight: 400;
    letter-spacing: 1.5px;
    display: inline-block;
    margin-right: 11px;
}

.site-dropdown-demo {
  border-radius: 8px;
    border-radius: 8px;
}