From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/searchL/Widget.js | 60 +++++++++++-------------------------------------------------
1 files changed, 11 insertions(+), 49 deletions(-)
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 9fccebf..760379e 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -11,7 +11,8 @@
'jimu/BaseWidget',
'jimu/utils',
'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
- 'libs/zTree_v3/js/jquery.ztree.all'
+ 'libs/zTree_v3/js/jquery.ztree.all',
+ './Cesiumadd'
],
function (declare,
lang,
@@ -33,50 +34,7 @@
startup: function () {
var that = this;
- function createTooltip(frameDiv) {//抄录createTooltip函数
-
- var tooltip = function (frameDiv) {
-
- var div = document.createElement('DIV');
- div.className = "twipsy right";
-
- var arrow = document.createElement('DIV');
- arrow.className = "twipsy-arrow";
- div.appendChild(arrow);
-
- var title = document.createElement('DIV');
- title.className = "twipsy-inner";
- div.appendChild(title);
-
- this._div = div;
- this._title = title;
- this.message = '';
-
- // add to frame div and display coordinates
- frameDiv.appendChild(div);
- var that = this;
- div.onmousemove = function (evt) {
- that.showAt({ x: evt.clientX, y: evt.clientY }, that.message);
- };
- };
-
- tooltip.prototype.setVisible = function (visible) {
- this._div.style.display = visible ? 'block' : 'none';
- };
-
- tooltip.prototype.showAt = function (position, message) {
- if (position && message) {
- this.setVisible(true);
- this._title.innerHTML = message;
- this._div.style.left = position.x + 10 + "px";
- this._div.style.top = (position.y - this._div.clientHeight / 2) + "px";
- this.message = message;
- }
- };
-
- return new tooltip(frameDiv);
- }
- window.MYcreateTooltip = createTooltip;//全局使用
+
//关键词&&坐标
$("#i-f-gjz").click(function () {
@@ -100,7 +58,7 @@
$(".searchImg").click(function () {
that.getInputData();
- topic.publish('getLegendsData', that.searchDatas);
+
that.addOneEntitys.removeAll();
if (typeof that.searchDatas == 'string') {
var han = /^[\u4e00-\u9fa5]+$/;
@@ -143,14 +101,13 @@
$(".searchColce").click(function () {
$('.searchLMain').hide();
that.addOneEntitys.removeAll();
- topic.publish('getLegendsData', '');
+ topic.publish('getLegendsData', "legends", '');
})
$("#local_data").keyup(function (e) {
// console.log(e);
that.getInputData();
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 == ' ') {
@@ -216,10 +173,13 @@
if (d == []) {
if (n == 0) {
this.beginLayUi(d);
+ topic.publish('getLegendsData', "legends", d, "./images/addL/全景.png", "全景站点");
} else if (n == 1) {
this.beginLayUi(1, d);
+ topic.publish('getLegendsData', "legends", d, "./images/addL/监控.png", "监控站点");
} else if (n == 2) {
this.beginLayUi(1, 1, d);
+ topic.publish('getLegendsData', "legends", d, "./images/addL/全景.png", "监测站点");
}
} else {
var i = 1;
@@ -231,10 +191,13 @@
var data = d;
if (n == 0) {
this.beginLayUi(data);
+ topic.publish('getLegendsData', "legends", d, "./images/addL/全景.png", "全景站点");
} else if (n == 1) {
this.beginLayUi(1, data);
+ topic.publish('getLegendsData', "legends", d, "./images/addL/监控.png", "监控站点");
} else if (n == 2) {
this.beginLayUi(1, 1, data);
+ topic.publish('getLegendsData', "legends", d, "./images/addL/监测.png", "监测站点");
}
}
},
@@ -244,7 +207,6 @@
this.map.dataSources.add(dataSourceOne);
//面板打开的时候触发
var that = this;
- that.getData(0)
layui.use('element', function () {
var $ = layui.jquery
, element = layui.element;
--
Gitblit v1.9.3