From 78471471db6c266fa72fc8421590cb793279633f Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 15 Jun 2021 17:14:14 +0800
Subject: [PATCH] bug
---
widgets/LeftNavigationBar/Widget.js | 19 +++++++++
widgets/searchTabaPopup/css/style.css | 72 +++++++++++++++++++++++++++++-------
widgets/searchL/Widget.js | 10 +++-
3 files changed, 84 insertions(+), 17 deletions(-)
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index 7d9d3af..2dc7d4f 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -390,6 +390,7 @@
// console.log(obj.data.id, '--', obj.checked, obj); //得到当前点击的节点数据
// console.log(obj.checked); //得到当前节点的展开状态：open、close、normal
// console.log(obj.elem); //得到当前节点元素
+ var keyId = that.getUrlKeyId("serviceId");
if (obj.data.children && obj.data.children.length > 0) {
@@ -436,6 +437,7 @@
});
});
} else {
+
obj.data.children.forEach(item => {
$.ajax({
url: item.src + '/maps.json',
@@ -447,9 +449,18 @@
url: res[0].path,
}));
that[item.id].alpha = item.alpha
+
+ if (keyId && keyId != "") {
+ that[item.id].getViewableRectangle().then(function (rectangle) {
+ return that.map.camera.flyTo({
+ destination: rectangle
+ });
+ });
+ }
}
})
});
+
}
@@ -530,6 +541,14 @@
url: res[0].path,
}));
that[obj.data.id].alpha = obj.data.alpha
+
+ if (keyId && keyId != "") {
+ that[obj.data.id].getViewableRectangle().then(function (rectangle) {
+ return that.map.camera.flyTo({
+ destination: rectangle
+ });
+ });
+ }
}
})
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index e1abfe1..2e74726 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -29,6 +29,7 @@
layers: {},
states: 'one',
searchDatas: '',
+ addOneEntitys: null,
startup: function () {
var that = this;
@@ -94,7 +95,7 @@
})
$(".searchColce").click(function () {
$('.searchLMain').hide();
- that.map.entities.removeAll();
+ that.addOneEntitys.removeAll();
})
$("#local_data").keyup(function (e) {
@@ -160,7 +161,7 @@
})
},
createDatas: function (d, n) {
- this.map.entities.removeAll();//清除图标点
+ this.addOneEntitys.removeAll();//清除图标点
if (d == []) {
if (n == 0) {
this.beginLayUi(d);
@@ -187,6 +188,9 @@
}
},
onOpen: function () {
+ var dataSourceOne = new Cesium.CustomDataSource();
+ this.addOneEntitys = dataSourceOne.entities;
+ this.map.dataSources.add(dataSourceOne);
//面板打开的时候触发
var that = this;
that.getData(0)
@@ -307,7 +311,7 @@
//定位实体位置
shiti: function (data, i) {
var imgs = i == 1 ? 'images/addL/全景.png' : i == 2 ? 'images/addL/监控.png' : i == 3 ? 'images/addL/监测.png' : '';
- this.map.entities.add({
+ this.addOneEntitys.add({
id: data.id, // 实体ID
name: data.name, // 实体名称
position: Cesium.Cartesian3.fromDegrees(Number(data.lon), Number(data.lat)), // x,y 实体经纬度
diff --git a/widgets/searchTabaPopup/css/style.css b/widgets/searchTabaPopup/css/style.css
index 551da24..a97d37d 100644
--- a/widgets/searchTabaPopup/css/style.css
+++ b/widgets/searchTabaPopup/css/style.css
@@ -143,6 +143,7 @@
.jimu-widget-searchTabaPopup .layui-tab {
margin: 0 !important;
+ height: 100%;
}
.jimu-widget-searchTabaPopup .three {
@@ -156,28 +157,59 @@
/* border: 1px salmon solid; */
}
+.jimu-widget-searchTabaPopup .xiangqing table {
+ height: 100% !important;
+}
+
+
+.jimu-widget-searchTabaPopup .shishishuju .layui-tab {
+ margin-top: 10px !important;
+ height: calc(100% - 46px) !important;
+}
+
+.jimu-widget-searchTabaPopup .shishishuju .layui-table {
+ margin: 0 !important;
+}
+
+
+.jimu-widget-searchTabaPopup .lishijilv {
+ height: 100%;
+}
+.jimu-widget-searchTabaPopup .lishijilv .layui-tab {
+ margin-top: 10px !important;
+ height: calc(100% - 42px) !important;
+}
+
+.jimu-widget-searchTabaPopup .lishijilv .layui-inline,
+.jimu-widget-searchTabaPopup .lishijilv .layui-form-item {
+ margin: 0 !important;
+}
+
.jimu-widget-searchTabaPopup .xiangqing th {
width: 160px;
text-align-last: justify;
font-size: 14px;
- padding: 19px;
+ padding: 16px;
border-right: transparent 1px solid !important;
}
.jimu-widget-searchTabaPopup .xiangqing td {
width: 380px;
text-align-last: right;
- padding-right: 5px;
+ padding-right: 16px;
font-size: 14px;
}
-.jimu-widget-searchTabaPopup .xiangqing tr:nth-child(6) td, .jimu-widget-searchTabaPopup .xiangqing tr:nth-child(7) td {
+.jimu-widget-searchTabaPopup .xiangqing tr:nth-child(6) td,
+.jimu-widget-searchTabaPopup .xiangqing tr:nth-child(7) td {
text-align-last: left;
text-indent: 2em;
padding-left: 5px;
}
-.jimu-widget-searchTabaPopup .xiangqing th, .jimu-widget-searchTabaPopup .xiangqing td, .jimu-widget-searchTabaPopup .xiangqing table {
+.jimu-widget-searchTabaPopup .xiangqing th,
+.jimu-widget-searchTabaPopup .xiangqing td,
+.jimu-widget-searchTabaPopup .xiangqing table {
border-color: rgba(0, 0, 0, .1);
}
@@ -201,13 +233,21 @@
font-size: 16px;
padding-bottom: 5px;
padding-top: 5px;
+ color: #86888A;
}
-.layui-tab-content {
+.jimu-widget-searchTabaPopup .layui-tab-content {
+ margin-top: 10px !important;
padding: 0 !important;
+ height: calc(100% - 51px) !important;
}
-.jimu-widget-searchTabaPopup .shishishuju thead th, .jimu-widget-searchTabaPopup .shishishuju tbody td {
+.jimu-widget-searchTabaPopup .layui-tab-item {
+ height: 100% !important;
+}
+
+.jimu-widget-searchTabaPopup .shishishuju thead th,
+.jimu-widget-searchTabaPopup .shishishuju tbody td {
text-align: center;
}
@@ -216,7 +256,7 @@
}
.jimu-widget-searchTabaPopup .lishijilv .heard {
- font-size: 16px;
+ font-size: 15px;
display: flex;
align-items: center;
justify-content: space-between;
@@ -226,12 +266,6 @@
/* border: 1px solid springgreen; */
display: flex;
align-items: center;
-}
-
-.jimu-widget-searchTabaPopup .lishijilv .heard .layui-form-item {
- /* border: 1px solid springgreen; */
- position: relative;
- top: 12px;
}
input::-webkit-input-placeholder {
@@ -256,7 +290,8 @@
font-size: 14px;
}
-.jimu-widget-searchTabaPopup .lishijilv #query, .jimu-widget-searchTabaPopup .lishijilv #empty {
+.jimu-widget-searchTabaPopup .lishijilv #query,
+.jimu-widget-searchTabaPopup .lishijilv #empty {
border-radius: 5px;
}
@@ -273,4 +308,13 @@
.jimu-widget-searchTabaPopup #shuiwenshishi {
overflow: auto;
height: 411px;
+}
+
+.jimu-widget-searchTabaPopup .layui-btn,
+.jimu-widget-searchTabaPopup .layui-input {
+ height: 32px !important;
+ line-height: 32px !important;
+}
+.jimu-widget-searchTabaPopup .layui-form-mid {
+ padding: 6px 0 !important;
}
\ No newline at end of file
--
Gitblit v1.9.3