From b1d6d9bd7cfbd6b5a78b118ae130a41d8e00633b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 07 Jun 2021 09:36:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
images/addL/wshijiao.png | 0
images/toolbox2.png | 0
widgets/LeftNavigationBar/Widget.html | 2
images/addL/bshijiao.png | 0
images/query.png | 0
images/addL/wtiyan.png | 0
images/addL/sous.png | 0
widgets/instructions/css/style.css | 14 ++++---
images/addL/wquanqiu.png | 0
images/query1.png | 0
widgets/LeftNavigationBar/Widget.js | 43 ++++++++++-----------
widgets/LeftNavigationBar/css/style.css | 15 +++++--
images/addL/bquanqiu.png | 0
images/addL/btiyan.png | 0
widgets/legends/css/style.css | 22 +++++-----
images/addL/wtiyan - 副本.png | 0
widgets/searchL/Widget.html | 2
widgets/searchL/css/style.css | 16 +++++--
18 files changed, 64 insertions(+), 50 deletions(-)
diff --git a/images/addL/bquanqiu.png b/images/addL/bquanqiu.png
index 1f1fe95..4c920c1 100644
--- a/images/addL/bquanqiu.png
+++ b/images/addL/bquanqiu.png
Binary files differ
diff --git a/images/addL/bshijiao.png b/images/addL/bshijiao.png
index df46c1d..22a2afb 100644
--- a/images/addL/bshijiao.png
+++ b/images/addL/bshijiao.png
Binary files differ
diff --git a/images/addL/btiyan.png b/images/addL/btiyan.png
index 51e0820..31645f1 100644
--- a/images/addL/btiyan.png
+++ b/images/addL/btiyan.png
Binary files differ
diff --git a/images/addL/sous.png b/images/addL/sous.png
new file mode 100644
index 0000000..0ec0549
--- /dev/null
+++ b/images/addL/sous.png
Binary files differ
diff --git a/images/addL/wquanqiu.png b/images/addL/wquanqiu.png
index bc5a9ad..46ccc95 100644
--- a/images/addL/wquanqiu.png
+++ b/images/addL/wquanqiu.png
Binary files differ
diff --git a/images/addL/wshijiao.png b/images/addL/wshijiao.png
index 4c6e15a..bfb9232 100644
--- a/images/addL/wshijiao.png
+++ b/images/addL/wshijiao.png
Binary files differ
diff --git "a/images/addL/wtiyan - \345\211\257\346\234\254.png" "b/images/addL/wtiyan - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..902d067
--- /dev/null
+++ "b/images/addL/wtiyan - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/images/addL/wtiyan.png b/images/addL/wtiyan.png
index 902d067..0840714 100644
--- a/images/addL/wtiyan.png
+++ b/images/addL/wtiyan.png
Binary files differ
diff --git a/images/query.png b/images/query.png
index f79ac7e..b0d5952 100644
--- a/images/query.png
+++ b/images/query.png
Binary files differ
diff --git a/images/query1.png b/images/query1.png
new file mode 100644
index 0000000..f79ac7e
--- /dev/null
+++ b/images/query1.png
Binary files differ
diff --git a/images/toolbox2.png b/images/toolbox2.png
new file mode 100644
index 0000000..7af1c78
--- /dev/null
+++ b/images/toolbox2.png
Binary files differ
diff --git a/widgets/LeftNavigationBar/Widget.html b/widgets/LeftNavigationBar/Widget.html
index af42589..706bdef 100644
--- a/widgets/LeftNavigationBar/Widget.html
+++ b/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>
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index 8a0a97f..5f0382a 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/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");
diff --git a/widgets/LeftNavigationBar/css/style.css b/widgets/LeftNavigationBar/css/style.css
index 705adb2..b53e680 100644
--- a/widgets/LeftNavigationBar/css/style.css
+++ b/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;
}
\ No newline at end of file
diff --git a/widgets/instructions/css/style.css b/widgets/instructions/css/style.css
index 17b6070..dbd0ea3 100644
--- a/widgets/instructions/css/style.css
+++ b/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;
}
\ No newline at end of file
diff --git a/widgets/legends/css/style.css b/widgets/legends/css/style.css
index 86b5c21..28e3e5a 100644
--- a/widgets/legends/css/style.css
+++ b/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) {
diff --git a/widgets/searchL/Widget.html b/widgets/searchL/Widget.html
index 6496042..70653fa 100644
--- a/widgets/searchL/Widget.html
+++ b/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">
diff --git a/widgets/searchL/css/style.css b/widgets/searchL/css/style.css
index e2077ce..1c6d0ae 100644
--- a/widgets/searchL/css/style.css
+++ b/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;
}
--
Gitblit v1.9.3