From d1b572d63b7d15f3243e17fe793f3d080ff03255 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 16 Jun 2021 11:52:40 +0800
Subject: [PATCH] 搜索细节调整，弹框字体，行点击定位
---
widgets/legends/Widget.html | 4 +-
widgets/searchTabaPopup/css/style.css | 1
widgets/legends/Widget.js | 56 ++++++++++++----------------
widgets/searchL/Widget.js | 14 ++++++
4 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/widgets/legends/Widget.html b/widgets/legends/Widget.html
index 2af8bad..bd24c86 100644
--- a/widgets/legends/Widget.html
+++ b/widgets/legends/Widget.html
@@ -2,12 +2,12 @@
<div class="title">图层列表</div>
<div class="main">
<div id="legendsInquanjing">
- <!-- <div class="m-init"> <i><img src="./images/addL/dwblue.png" /></i> 全景站点 <i>(20个)</i> </div> -->
+ <div class="m-init"> <i><img src="./images/addL/全景.png" /></i> 全景站点 <i>(0个)</i> </div>
<!-- <div class="m-init m-i-child"> <i></i> 大湖池<i>(1个)</i> </div>
<div class="m-init m-i-child"> <i></i> 战备胡 <i>(1个)</i> </div> -->
</div>
<div id="legendsInjiankong">
- <!-- <div class="m-init"> <i><img src="./images/addL/dworgin.png" /></i> 监控站点 <i>(50个)</i> </div> -->
+ <div class="m-init"> <i><img src="./images/addL/监控.png" /></i> 监控站点 <i>(0个)</i> </div>
<!-- <div class="m-init m-i-child"> <i></i> 大湖池 <i>(1个)</i> </div> -->
</div>
<div class="m-init"> <i><img src="./images/addL/forgin.png" /></i> 鄱阳湖面积 <i>(3253.52公顷)</i> </div>
diff --git a/widgets/legends/Widget.js b/widgets/legends/Widget.js
index 3177a50..3c2324b 100644
--- a/widgets/legends/Widget.js
+++ b/widgets/legends/Widget.js
@@ -34,7 +34,7 @@
},
onGetLegendsData: function (item) {
var val = item == ' ' ? '' : item;
- console.log(val)
+ // console.log(val)
var that = this
, twoData = []
// url = `http://171.34.76.171:8880/pyh-wetResource/monitorRecords/queryMonitorData?name=&start&limit&type=${index}`
@@ -49,7 +49,7 @@
if (res.data.code == 200) {
var data = res.data.data.panoramaList || res.data.data.stationList || res.data.data.videoList || []
, onceData = {};
- console.log(data);
+ // console.log(data);
for (var k in data) {
if (i == 0) {
onceData[data[k].protectArea] = onceData[data[k].protectArea] == undefined ? 1 : onceData[data[k].protectArea] += 1;
@@ -59,44 +59,36 @@
}
twoData.push(onceData)
if (i == 2) {
- ready(twoData);
+ ready(twoData, item);
}
} else {
console.log('请求访问失败')
}
})
}
- , ready = function (d, i) {
- console.log(d);
+ , ready = function (d, val) {
+ // console.log(d);
+ if (val == '') {
+ d = {};
+ }
+ var init = (data, dom, img) => {
+ var q = data
+ , num = 0
+ , strq
+ , domq = $(dom)
+ , h = '';
+ domq.empty();
+ for (var k in q) {
+ num += q[k];
+ h += `<div class="m-init m-i-child"> <i></i> ${k}<i>(${q[k]}个)</i> </div>`;
+ }
+ strq = `<div class="m-init"> <i><img src="./images/addL/${img}.png" /></i> ${img}站点 <i>(${num}个)</i> </div>` + h;
+ domq.append(strq);
+ }
// 全景
- var q = d[0]
- , num = 0
- , strq
- , domq = $('#legendsInquanjing')
- , h = '';
- domq.empty();
- for (var k in q) {
- num += q[k];
- h += `<div class="m-init m-i-child"> <i></i> ${k}<i>(${q[k]}个)</i> </div>`;
- }
- strq = `<div class="m-init"> <i><img src="./images/addL/全景.png" /></i> 全景站点 <i>(${num}个)</i> </div>` + h;
- domq.append(strq);
-
+ init(d[0], '#legendsInquanjing', '全景');
// 监控
- q = d[1];
- num = 0;
- strq;
- domq = $('#legendsInjiankong');
- h = '';
- domq.empty();
- for (var k in q) {
- num += q[k];
- h += `<div class="m-init m-i-child"> <i></i> ${k}<i>(${q[k]}个)</i> </div>`;
- }
- strq = `<div class="m-init"> <i><img src="./images/addL/监控.png" /></i> 监控站点 <i>(${num}个)</i> </div>` + h;
- domq.append(strq);
-
-
+ init(d[1], '#legendsInjiankong', '监控');
}
, doit = () => {
var i = 0;
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 768de2c..b3793d0 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -56,6 +56,7 @@
$(".searchImg").click(function () {
that.getInputData();
topic.publish('getLegendsData', that.searchDatas);
+ that.addOneEntitys.removeAll();
if (typeof that.searchDatas == 'string') {
var han = /^[\u4e00-\u9fa5]+$/;
if (han.test(that.searchDatas) || that.searchDatas == ' ') {
@@ -102,8 +103,9 @@
$("#local_data").keyup(function (e) {
// console.log(e);
that.getInputData();
- topic.publish('getLegendsData', that.searchDatas);
if (e.keyCode == 13 && typeof that.searchDatas == 'string') {
+ topic.publish('getLegendsData', that.searchDatas);
+ that.addOneEntitys.removeAll();
var han = /^[\u4e00-\u9fa5]+$/;
if (han.test(that.searchDatas) || that.searchDatas == ' ') {
that.getData(0, that.searchDatas);
@@ -135,6 +137,7 @@
},
getData: function (index, val) {
val = val == ' ' ? '' : val;
+
var d = $('.searchLMain').find('.layui-tab-item').hide;
var that = this,
url = `http://171.34.76.171:8880/pyh-wetResource/monitorRecords/queryMonitorData?name=${val}&start&limit&type=${index}`
@@ -398,6 +401,9 @@
that.goOnPosition([obj.data.lon, obj.data.lat], 1, obj.data);
}
});
+ table.on('row(test)', function (obj) {
+ that.goOnPosition([obj.data.lon, obj.data.lat], 1, obj.data);
+ });
}
if (data1 != 1) {
@@ -473,6 +479,9 @@
that.goOnPosition([obj.data.lon, obj.data.lat], 2, obj.data);
}
});
+ table.on('row(test1)', function (obj) {
+ that.goOnPosition([obj.data.lon, obj.data.lat], 2, obj.data);
+ });
}
if (data2 != 1) {
@@ -525,6 +534,9 @@
that.goOnPosition([obj.data.lon, obj.data.lat], 3, obj.data);
}
});
+ table.on('row(test2)', function (obj) {
+ that.goOnPosition([obj.data.lon, obj.data.lat], 3, obj.data);
+ });
}
// that.addTitle();
//…
diff --git a/widgets/searchTabaPopup/css/style.css b/widgets/searchTabaPopup/css/style.css
index a97d37d..05cdb01 100644
--- a/widgets/searchTabaPopup/css/style.css
+++ b/widgets/searchTabaPopup/css/style.css
@@ -13,6 +13,7 @@
/* border : 1px solid #000; */
/* cursor : pointer; */
z-index: 14 !important;
+ color: #555;
}
.jimu-widget-searchTabaPopup .popup {
--
Gitblit v1.9.3