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

shuishen

2021-06-07 b1d6d9bd7cfbd6b5a78b118ae130a41d8e00633b

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

 images/addL/bquanqiu.png

 images/addL/bshijiao.png

 images/addL/btiyan.png

 images/addL/sous.png

 images/addL/wquanqiu.png

 images/addL/wshijiao.png

 images/addL/wtiyan - 副本.png

 images/addL/wtiyan.png

 images/query.png

 images/query1.png

 images/toolbox2.png

 widgets/LeftNavigationBar/Widget.html

@@ -5,7 +5,7 @@
    <div class="left-navigation-bar-main">
        <!-- <ul id="treeDemo" class="ztree"></ul> -->
        <div class="l-n-b-m-search">
            <input id="left-navigation-bar-main-input" type="search" value="河流" placeholder="请输入图层名称" />
            <input id="left-navigation-bar-main-input" type="search"  placeholder="请输入图层名称" />
            <!-- <button type="button" class="layui-btn layui-btn-sm" lay-demo="reload">重载</button> -->
            <img id="left-navigation-bar-main-search" src="../../images/addL/sousuo.png" alt="">
        </div>

 widgets/LeftNavigationBar/Widget.js

@@ -59,12 +59,10 @@
                            domDiv.css({ 'display': 'none' })
                        }
                            , a
                            , useit = (d,i) => {
                                var i = i || [];
                            , useit = (d) => {
                                for (var k in d) {
                                    if (d[k].who == 'father') {
                                        that.father = d[k].id
                                        // console.log(that.father, i)
                                        that.father = d[k].id;
                                    }
                                    if (d[k].title.indexOf(val) != -1) {//选中id
                                        a = '' + d[k].id;
@@ -77,11 +75,10 @@
                                        let domDiv = dom.find('.layui-tree-pack').eq(0);
                                        domDiv.css({ 'display': 'block' })
                                        // }
                                        // console.log(a, that.father)
                                        console.log(a, that.father)
                                    }
                                    if (d[k].children) {
                                        i.push(that.father)
                                        useit(d[k].children,i);
                                        useit(d[k].children);
                                    }
                                }
                            };
@@ -154,17 +151,19 @@

                    };
                inits(val, data);
                console.log(data)
                // console.log(data)

                var ccinit = (a) => {
                    for (let k in a) {
                        if (a[k].children) {
                            a[k].who = 'father';
                            // console.log(a[k].id)
                            ccinit(a[k].children)
                        }
                    }
                };
                // var i = 0,
                //     ccinit = (a) => {
                //         i++;
                //         for (let k in a) {
                //             if (a[k].children) {
                //                 a[k].who = i;
                //                 // console.log(a[k].id)
                //                 ccinit(a[k].children)
                //             }
                //         }
                //     };
                // ccinit(this.data);
                // console.log(this.data)
                this.data = data;
@@ -186,12 +185,12 @@
                        , click: function (obj) {
                            var data = obj.data;  //获取当前点击的节点数据
                            // layer.msg('状态：' + obj.state + '<br>节点数据：' + JSON.stringify(data));
                            // console.log(obj);
                            console.log(obj);
                            // 树点击三角形样式修改
                            var ot = $('.layui-tree-iconArrow');
                            ot.removeClass("left-navigation-bar-main-down");
                            var jt = $(`[data-id='${data.id}']`).find('.layui-tree-iconArrow').eq(0);
                            jt.addClass('left-navigation-bar-main-down');
                            // var ot = $('.layui-tree-iconArrow');
                            // ot.removeClass("left-navigation-bar-main-down");
                            // var jt = $(`[data-id='${data.id}']`).find('.layui-tree-iconArrow').eq(0);
                            // jt.addClass('left-navigation-bar-main-down');
                            // 树点击样式修改
                            // var ot = $('.layui-tree-entry');
                            // ot.removeClass("left-navigation-bar-main-current");

 widgets/LeftNavigationBar/css/style.css

@@ -86,24 +86,24 @@
}

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

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

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

@@ -150,4 +150,11 @@

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

.layui-form-checked[lay-skin=primary] i{
  background-color: #36A0FD !important;
}
.layui-tree-spread .layui-tree-iconArrow:after{
  border-color: #c0c4cc transparent  transparent transparent  !important;
}

 widgets/instructions/css/style.css

@@ -1,9 +1,9 @@
.jimu-widget-instructions {
  position: absolute !important;
  font-size: 14px;
  height: 50px !important;
  height: 42px !important;
  line-height: 32px;
  width: 200px !important;
  width: 160px !important;
  right: auto !important;
  bottom: auto !important;
  left: 260px;
@@ -12,7 +12,7 @@
  background: rgba(255, 255, 255, 1);
  color: #fff;
  /* border : 1px solid rgba(0, 0, 0, 0.3); */
  border-radius: 6px 6px 6px 6px;
  border-radius: 14px;
  /* text-align   : center; */
  /* cursor       : pointer; */
  z-index: 15 !important;
@@ -25,12 +25,14 @@
}

.jimu-widget-instructions img {
  width: 35px;
  width: 20px;
  position: relative;
  left: -5px;
}

.jimu-widget-instructions .instructions-title {
  color: #5AA9FB;
  font-size: 1.3rem;
  font-weight: 600;
  font-size: 1rem;
  font-weight: 400;
  letter-spacing:1.5px;
}

 widgets/legends/css/style.css

@@ -1,9 +1,9 @@
.jimu-widget-legends {
  position: absolute !important;
  font-size: 14px;
  height: 320px !important;
  height: 243px !important;
  line-height: 32px;
  width: 280px !important;
  width: 188px !important;
  right: 60px !important;
  bottom: 40px !important;
  left: auto !important;
@@ -17,21 +17,21 @@
  /* cursor       : pointer; */
  z-index: 15 !important;
  box-sizing: border-box;
  padding: 0 20px 0 20px!important;
  padding: 0 6px 0 6px!important;
}

.jimu-widget-legends .title {
  margin: 10px 0 7px 0;
  font-size: 1.1rem;
  /* margin: 10px 0 7px 0; */
  font-size: 0.5rem;
}

.jimu-widget-legends .main .m-init {
  width: 100%;
  height: 2rem;
  height: 1.5rem;
  flex-direction: row;
  display: flex;
  align-items: center;
  font-size: 1.1rem;
  font-size: 0.6rem;
}

.jimu-widget-legends .main .m-init i {
@@ -42,16 +42,16 @@
.jimu-widget-legends .main .m-init i:nth-child(1) {
  display: inline-block;
  width: 20px;
  height: 1.5rem;
  /* height: 0.6rem; */
  /* border: 1px solid springgreen; */
  background-size: 100%;
  margin-right: 15px;
}

.jimu-widget-legends .main .m-init img {
  width: 30px;
  position: relative;
  top: -5.5px;
  width: 24px;
  /* position: relative;
  top: -5.5px; */
}

.jimu-widget-legends .main .m-i-child i:nth-child(1) {

 widgets/searchL/Widget.html

@@ -11,7 +11,7 @@
        <input id="local_data2" autocomplete="off" data-provide="typeahead" type="text" class="input-sms1"
            placeholder="输入纬度" />
    </div>
    <img class="input_img searchImg" src="images/query.png">
    <img class="input_img searchImg" src="images/addL/sous.png">
    <div class="searchLMain">
        <div class="searchColce">X</div>
        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">

 widgets/searchL/css/style.css

@@ -57,7 +57,10 @@
  align-items: center;
  justify-content: center;
}

.jimu-widget-searchL #inputTwo #local_data2{
  position: relative;
  left: -15px;
}
.jimu-widget-searchL .input-sms1 {
  width: 90px;
  height: 35px;
@@ -75,26 +78,29 @@
  border: none;
  /* border-radius: 0px 5px 5px 0px; */
}
.jimu-widget-searchL .input_img {

  border-left: 1px solid rgba(0, 0, 0, .2);
}
.jimu-widget-searchL .input-sms1::-webkit-input-placeholder, .jimu-widget-searchL .input-sms::-webkit-input-placeholder {
  color: #000;
  color: #afafaf;
  font-size: 14px;
}

.jimu-widget-searchL .input-sms1::-moz-placeholder, .jimu-widget-searchL .input-sms::-moz-placeholder {
  /* Mozilla Firefox 19+ */
  color: #000;
  color: #afafaf;
  font-size: 14px;
}

.jimu-widget-searchL .input-sms1:-moz-placeholder, .jimu-widget-searchL .input-sms:-moz-placeholder {
  /* Mozilla Firefox 4 to 18 */
  color: #000;
  color: #afafaf;
  font-size: 14px;
}

.jimu-widget-searchL .input-sms1::-ms-input-placeholder, .jimu-widget-searchL .input-sms::-ms-input-placeholder {
  color: #000;
  color: #afafaf;
  font-size: 14px;
}