From 95c1f10a276a69ce4fdcc72e68a35c796581d143 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 11 Jun 2021 16:19:19 +0800
Subject: [PATCH] 左侧目录树优化，及搜索部分样式调整，部分图片路径更改
---
widgets/LeftNavigationBar/Widget.js | 18 +++
widgets/LeftNavigationBar/Widget.html | 4
widgets/searchL/Widget.js | 7
widgets/FlyRoute/flyroute.json | 210 ++++++++++++++++++++++++-----------------
widgets/instructions/Widget.html | 2
widgets/searchL/Widget.html | 2
widgets/searchL/css/style.css | 48 +++++++--
7 files changed, 183 insertions(+), 108 deletions(-)
diff --git a/widgets/FlyRoute/flyroute.json b/widgets/FlyRoute/flyroute.json
index 6741a7f..0bb9b72 100644
--- a/widgets/FlyRoute/flyroute.json
+++ b/widgets/FlyRoute/flyroute.json
@@ -1,113 +1,149 @@
[{
- "name": "鄱阳湖区域浏览",
+ "name": "鄱阳湖区域漫游",
"sites": [{
- "id": 0,
- "lgtd": 116.36485651934478,
- "lttd": 28.61499997888566,
- "height": 21615.65670519218,
- "heading": 357.5324369211186,
- "pitch": -33.949736768804875,
- "roll": 0.07493032373110281,
- "time": 3
- }, {
"id": 1,
- "lgtd": 116.61798359831062,
- "lttd": 28.678026785994387,
- "height": 21615.65670518082,
- "heading": 328.4540952954534,
- "pitch": -33.9497367688052,
- "roll": 0.1007963589203403,
- "time": 3
+ "lgtd": 116.13696579962681,
+ "lttd": 27.221462117854543,
+ "height": 69625.54238025927,
+ "heading": 2.770614027788599,
+ "pitch": -30.468120445644498,
+ "roll": 1.9149483626155542e-9,
+ "time": 2.593586572472713
}, {
"id": 2,
- "lgtd": 116.87603493936163,
- "lttd": 28.921761691820024,
- "height": 21615.6567051778,
- "heading": 287.79156780309444,
- "pitch": -33.94973676880269,
- "roll": 0.12547175713320183,
- "time": 3
+ "lgtd": 116.40102040574489,
+ "lttd": 27.448113006353672,
+ "height": 69625.54238025789,
+ "heading": 356.1734320706876,
+ "pitch": -30.468120445644626,
+ "roll": 0.19345233721288962,
+ "time": 4.28862240235211
}, {
"id": 3,
- "lgtd": 116.909026583975,
- "lttd": 29.210477509533032,
- "height": 21615.656705175323,
- "heading": 250.72860434190048,
- "pitch": -33.94973676880164,
- "roll": 0.1182078443376804,
- "time": 3
+ "lgtd": 116.98970423040575,
+ "lttd": 27.583473004937616,
+ "height": 69625.5423802608,
+ "heading": 339.3020994144722,
+ "pitch": -30.468120445644548,
+ "roll": 0.39282634210952483,
+ "time": 4.698599153873587
}, {
"id": 4,
- "lgtd": 116.83971215830472,
- "lttd": 29.411874687056383,
- "height": 21615.656705178324,
- "heading": 220.5678813179093,
- "pitch": -33.949736768801614,
- "roll": 0.14418892227725896,
- "time": 3
+ "lgtd": 117.54002942122602,
+ "lttd": 27.91811725902511,
+ "height": 69625.54238025965,
+ "heading": 319.5189245496973,
+ "pitch": -30.46812044564414,
+ "roll": 0.3344651251897885,
+ "time": 4.168660397496815
}, {
"id": 5,
- "lgtd": 116.63736760852666,
- "lttd": 29.559276610554274,
- "height": 21615.65670518267,
- "heading": 192.7750271204978,
- "pitch": -33.94973676880136,
- "roll": 0.11990434840510432,
- "time": 3
+ "lgtd": 117.95427795010265,
+ "lttd": 28.294071395230148,
+ "height": 69625.54238025325,
+ "heading": 298.398812496663,
+ "pitch": -30.46812044564409,
+ "roll": 0.2722540584948179,
+ "time": 3.794001094775054
}, {
"id": 6,
- "lgtd": 116.35268250530002,
- "lttd": 29.569093455601525,
- "height": 21615.656705182217,
- "heading": 159.031653642729,
- "pitch": -33.949736768801486,
- "roll": 0.12226477526126023,
- "time": 3
+ "lgtd": 118.1492606146489,
+ "lttd": 28.73940139806807,
+ "height": 69625.54238025444,
+ "heading": 279.37765475703765,
+ "pitch": -30.468120445644853,
+ "roll": 0.25206741939215377,
+ "time": 5.267132599677685
}, {
"id": 7,
- "lgtd": 116.03398252452703,
- "lttd": 29.43313255053548,
- "height": 21615.656705183854,
- "heading": 129.44379294438437,
- "pitch": -33.949736768801486,
- "roll": 0.1399973458170845,
- "time": 3
+ "lgtd": 118.15440296043559,
+ "lttd": 29.4018025509551,
+ "height": 69625.54238025927,
+ "heading": 253.0840095792882,
+ "pitch": -30.468120445644395,
+ "roll": 0.33789138605197255,
+ "time": 4.795333589966117
}, {
"id": 8,
- "lgtd": 115.56656976497351,
- "lttd": 29.31417361097843,
- "height": 36832.409250694924,
- "heading": 104.1903000851007,
- "pitch": -36.64434419262527,
- "roll": 359.9999999990976,
- "time": 3
+ "lgtd": 117.864665004058,
+ "lttd": 29.94983231931571,
+ "height": 69625.54238026211,
+ "heading": 229.65665912711376,
+ "pitch": -30.46812044564353,
+ "roll": 0.34147587830959975,
+ "time": 3.90164393578472
}, {
"id": 9,
- "lgtd": 115.740825901675,
- "lttd": 28.69543529618644,
- "height": 29061.533148178412,
- "heading": 48.8874638325123,
- "pitch": -37.012291045271574,
- "roll": 0.13594606119813848,
- "time": 3
+ "lgtd": 117.46815991160483,
+ "lttd": 30.300774486636858,
+ "height": 69625.54238026975,
+ "heading": 212.08224323327354,
+ "pitch": -30.468120445643276,
+ "roll": 0.26152078119332656,
+ "time": 5.79379779551162
}, {
"id": 10,
- "lgtd": 116.04912917565872,
- "lttd": 28.499254393238655,
- "height": 24977.858469140665,
- "heading": 23.312402615521254,
- "pitch": -36.97115669047082,
- "roll": 0.1669937889431866,
- "time": 3
+ "lgtd": 116.70751493499984,
+ "lttd": 30.618643537315116,
+ "height": 69625.54238027362,
+ "heading": 187.13985080112406,
+ "pitch": -30.468120445643326,
+ "roll": 0.2970084342106054,
+ "time": 5.94380624333187
}, {
"id": 11,
- "lgtd": 116.0488849187321,
- "lttd": 27.591614215992426,
- "height": 100049.13699253049,
- "heading": 10.451947125671502,
- "pitch": -37.89649963820525,
- "roll": 0.15288734882291413,
- "time": 3
+ "lgtd": 115.84830244730652,
+ "lttd": 30.51167181830559,
+ "height": 69625.54238026685,
+ "heading": 162.0296329896802,
+ "pitch": -30.46812044564381,
+ "roll": 0.29065629020315314,
+ "time": 6.34805274862854
+ }, {
+ "id": 12,
+ "lgtd": 115.06553239021456,
+ "lttd": 30.086685971423663,
+ "height": 69625.54238026496,
+ "heading": 131.28469766040868,
+ "pitch": -30.468120445643606,
+ "roll": 0.2670512309222153,
+ "time": 5.44447019439281
+ }, {
+ "id": 13,
+ "lgtd": 114.6186439058435,
+ "lttd": 29.522352771185933,
+ "height": 69625.54238026099,
+ "heading": 105.92597259963087,
+ "pitch": -30.468120445643557,
+ "roll": 0.3515198075178521,
+ "time": 7.751967610067505
+ }, {
+ "id": 14,
+ "lgtd": 114.60888241471893,
+ "lttd": 28.54747058966928,
+ "height": 69625.54238025077,
+ "heading": 69.31583687053215,
+ "pitch": -30.468120445643404,
+ "roll": 0.3163993607862109,
+ "time": 5.8403926688473
+ }, {
+ "id": 15,
+ "lgtd": 114.96560043470814,
+ "lttd": 27.883613737880435,
+ "height": 69625.54238025342,
+ "heading": 43.189625385096654,
+ "pitch": -30.468120445643073,
+ "roll": 0.33788219699373634,
+ "time": 4.745027408869115
+ }, {
+ "id": 16,
+ "lgtd": 115.2920604052509,
+ "lttd": 27.361645264596028,
+ "height": 69625.54238025373,
+ "heading": 23.649506702823388,
+ "pitch": -30.468120445643173,
+ "roll": 0.32169504301905333,
+ "time": 2.289093655343274
}]
},
{
diff --git a/widgets/LeftNavigationBar/Widget.html b/widgets/LeftNavigationBar/Widget.html
index 573ecb3..0272314 100644
--- a/widgets/LeftNavigationBar/Widget.html
+++ b/widgets/LeftNavigationBar/Widget.html
@@ -1,13 +1,13 @@
<div>
<div class="left-navigation-bar-but">
- <img class="l-n-b-b-img" src="../../images/addL/xzuo.png" alt="">
+ <img class="l-n-b-b-img" src="./images/addL/xzuo.png" alt="">
</div>
<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" 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="">
+ <img id="left-navigation-bar-main-search" src="./images/addL/sousuo.png" alt="">
</div>
<!-- <div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-demo="getChecked">获取选中节点数据</button>
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index 1a7e5ac..c9ef115 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -198,6 +198,7 @@
})
},
changeData: function (val, type) { //重写数据
+ var that = this;
var data = [],
i = 1,
inits = (d, childData) => {
@@ -227,6 +228,21 @@
a.model = true
}
+ if (a.model) {
+
+ if (that[a.id]) {
+ Cesium.when(that[a.id], function (layer) {
+ that.map.scene.layers.remove(layer[0].name)
+ })
+ }
+
+ } else {
+
+ if (that[a.id]) {
+ that.map.imageryLayers.remove(that[a.id]);
+ }
+
+ }
b.push(a);
i++;
@@ -234,7 +250,7 @@
b[k].children = [];
b[k].who = 'father';
inits(d[k].children, b[k].children)
- }
+ }
}
};
diff --git a/widgets/instructions/Widget.html b/widgets/instructions/Widget.html
index 608ddee..cfe1431 100644
--- a/widgets/instructions/Widget.html
+++ b/widgets/instructions/Widget.html
@@ -1,4 +1,4 @@
<div>
- <img src="../../images/addL/leftdidian.png" alt="">
+ <img src="./images/addL/leftdidian.png" alt="">
<div class="instructions-title">鄱阳湖保护区</div>
</div>
\ No newline at end of file
diff --git a/widgets/searchL/Widget.html b/widgets/searchL/Widget.html
index 9dddfd4..e638988 100644
--- a/widgets/searchL/Widget.html
+++ b/widgets/searchL/Widget.html
@@ -20,7 +20,7 @@
<li>监控</li>
<li>监测</li>
</ul>
- <div class="layui-tab-content" style="height: 100px;">
+ <div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<table class="layui-hide" id="test" lay-filter="test"></table>
<div id="demoTable" style="display: none;">
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 1229485..d1a0351 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -59,6 +59,9 @@
if (han.test(that.searchDatas) || that.searchDatas == ' ') {
that.getData(0, that.searchDatas);
$('.searchLMain').show();
+ $('.searchLMain').find('ul.layui-tab-title li:eq(0)').addClass('layui-this').siblings().removeClass('layui-this');
+ $('.searchLMain').find('div.layui-tab-content > div.layui-tab-item:eq(0)').addClass('layui-show').siblings().removeClass('layui-show');
+
} else {
layui.use(function () { //亦可加载特定模块：layui.use(['layer', 'laydate', function(){
//得到各种内置组件
@@ -86,6 +89,7 @@
})
$(".searchColce").click(function () {
$('.searchLMain').hide();
+ that.map.entities.removeAll();
})
},
@@ -243,7 +247,6 @@
table.render({
elem: '#test'
// , url: './data'
- , height: 475
, page: { //支持传入 laypage 组件的所有参数（某些参数除外，如：jump/elem） - 详见文档
// layout: ['limit', 'count', 'prev', 'page', 'next', 'skip'] //自定义分页布局
layout: ['count', 'prev', 'page', 'next', 'skip'] //自定义分页布局
@@ -283,7 +286,6 @@
table.render({
elem: '#test1'
// , url: './data'
- , height: 475
, page: { //支持传入 laypage 组件的所有参数（某些参数除外，如：jump/elem） - 详见文档
// layout: ['limit', 'count', 'prev', 'page', 'next', 'skip'] //自定义分页布局
layout: ['count', 'prev', 'page', 'next', 'skip'] //自定义分页布局
@@ -364,7 +366,6 @@
table.render({
elem: '#test2'
// , url: './data'
- , height: 475
, page: { //支持传入 laypage 组件的所有参数（某些参数除外，如：jump/elem） - 详见文档
// layout: ['limit', 'count', 'prev', 'page', 'next', 'skip'] //自定义分页布局
layout: ['count', 'prev', 'page', 'next', 'skip'] //自定义分页布局
diff --git a/widgets/searchL/css/style.css b/widgets/searchL/css/style.css
index 7ad04b8..055ccad 100644
--- a/widgets/searchL/css/style.css
+++ b/widgets/searchL/css/style.css
@@ -57,8 +57,15 @@
align-items: center;
justify-content: center;
}
-.jimu-widget-searchL .searchLMain .layui-tab-content{
+
+.jimu-widget-searchL .searchLMain .layui-tab-content {
padding: 0 !important;
+ height: calc(100% - 40px);
+}
+
+.jimu-widget-searchL .searchLMain .layui-tab-content .layui-tab-item,
+.jimu-widget-searchL .searchLMain .layui-tab-content .layui-tab-item .layui-form {
+ height: 100%;
}
.jimu-widget-searchL #inputTwo #local_data2 {
@@ -88,24 +95,28 @@
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 {
+.jimu-widget-searchL .input-sms1::-webkit-input-placeholder,
+.jimu-widget-searchL .input-sms::-webkit-input-placeholder {
color: #afafaf;
font-size: 14px;
}
-.jimu-widget-searchL .input-sms1::-moz-placeholder, .jimu-widget-searchL .input-sms::-moz-placeholder {
+.jimu-widget-searchL .input-sms1::-moz-placeholder,
+.jimu-widget-searchL .input-sms::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: #afafaf;
font-size: 14px;
}
-.jimu-widget-searchL .input-sms1:-moz-placeholder, .jimu-widget-searchL .input-sms:-moz-placeholder {
+.jimu-widget-searchL .input-sms1:-moz-placeholder,
+.jimu-widget-searchL .input-sms:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: #afafaf;
font-size: 14px;
}
-.jimu-widget-searchL .input-sms1::-ms-input-placeholder, .jimu-widget-searchL .input-sms::-ms-input-placeholder {
+.jimu-widget-searchL .input-sms1::-ms-input-placeholder,
+.jimu-widget-searchL .input-sms::-ms-input-placeholder {
color: #afafaf;
font-size: 14px;
}
@@ -116,9 +127,7 @@
right: 5px;
top: 70px;
width: 462px;
- min-height: 540px;
- height: auto;
- padding-bottom: 20px;
+ height: 520px;
border-radius: 5px 5px 5px 5px;
background-color: rgb(255, 255, 255);
}
@@ -139,12 +148,14 @@
background-color: #ffffff;
}
-.jimu-widget-searchL .layui-tab-brief>.layui-tab-more li.layui-this:after, .layui-tab-brief>.layui-tab-title .layui-this:after {
+.jimu-widget-searchL .layui-tab-brief>.layui-tab-more li.layui-this:after,
+.layui-tab-brief>.layui-tab-title .layui-this:after {
border-bottom: 2px solid #39A5FD;
}
.jimu-widget-searchL .searchLMain .layui-tab-title {
/* border: 1px saddlebrown solid; */
+ margin-top: 10px;
display: flex;
align-items: center;
justify-content: space-around;
@@ -155,8 +166,14 @@
}
.jimu-widget-searchL .searchLMain .layui-table-view {
+ margin: 0 !important;
border-bottom: 1px #fff solid;
}
+
+.jimu-widget-searchL .searchLMain .layui-table-view .layui-table-box {
+ height: calc(100% - 41px);
+}
+
/*
.jimu-widget-searchL .searchLMain #layui-table-page1, .jimu-widget-searchL .searchLMain #layui-table-page2, .jimu-widget-searchL .searchLMain #layui-table-page3 {
position: relative;
@@ -169,7 +186,7 @@
position: relative;
top: -4px;
} */
-.jimu-widget-searchL .searchLMain [id^='layui-table-page']{
+.jimu-widget-searchL .searchLMain [id^='layui-table-page'] {
position: absolute;
left: 20px;
top: 5px;
@@ -183,8 +200,8 @@
.jimu-widget-searchL .searchLMain .searchColce {
position: absolute;
- right: 10px;
- top: 5px;
+ right: 0px;
+ top: 0px;
font-size: 16px;
color: #000;
width: 25px;
@@ -196,6 +213,11 @@
cursor: pointer;
}
+.jimu-widget-searchL .searchLMain .layui-tab {
+ height: calc(100% - 10px);
+ margin: 0;
+}
+
.jimu-widget-searchL .searchLMain .searchColce:hover {
color: red;
}
@@ -204,4 +226,4 @@
position: relative;
right: 1px;
top: -3px;
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3