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 |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 61b6aa1..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,
@@ -32,6 +33,8 @@
 			addOneEntitys: null,
 			startup: function () {
 				var that = this;
+
+			
 
 				//关键词&&坐标
 				$("#i-f-gjz").click(function () {
@@ -170,13 +173,13 @@
 				if (d == []) {
 					if (n == 0) {
 						this.beginLayUi(d);
-                        topic.publish('getLegendsData', "legends", d, "./images/addL/全景.png", "全景站点");
+						topic.publish('getLegendsData', "legends", d, "./images/addL/全景.png", "全景站点");
 					} else if (n == 1) {
 						this.beginLayUi(1, d);
-                        topic.publish('getLegendsData', "legends", d, "./images/addL/监控.png", "监控站点");
+						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", "监测站点");
+						topic.publish('getLegendsData', "legends", d, "./images/addL/全景.png", "监测站点");
 					}
 				} else {
 					var i = 1;
@@ -188,13 +191,13 @@
 					var data = d;
 					if (n == 0) {
 						this.beginLayUi(data);
-                        topic.publish('getLegendsData', "legends", d, "./images/addL/全景.png", "全景站点");
+						topic.publish('getLegendsData', "legends", d, "./images/addL/全景.png", "全景站点");
 					} else if (n == 1) {
 						this.beginLayUi(1, data);
-                        topic.publish('getLegendsData', "legends", d, "./images/addL/监控.png", "监控站点");
+						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", "监测站点");
+						topic.publish('getLegendsData', "legends", d, "./images/addL/监测.png", "监测站点");
 					}
 				}
 			},
@@ -234,7 +237,7 @@
 				this.mountainHandler.setInputAction(lang.hitch(this, this.clickHand), Cesium.ScreenSpaceEventType.LEFT_CLICK);
 			},
 			// 注册鼠标左键单击事件
-			clickHand: function clickHand(data) {
+			clickHand: function clickHand(data) {// 全局鼠标点击图标事件 渲染地图图标时 添加个相对应的数组储存该对象数据 通过数组是否存在判断点击的项目
 				var pickedObjects = this.map.scene.drillPick(data.position) || 0;
 				// console.log(pickedObjects);
 				if (pickedObjects.length != 0) {
@@ -303,6 +306,16 @@
 
 						} else if (pickedObjects[0].primitive.id.SQLData != undefined) {//SQL查询图标点击事件
 							// console.log('SQLData')
+						} else if (pickedObjects[0].primitive.id.spatialQueryData != undefined) {//SQL查询图标点击事件
+							var data = pickedObjects[0].primitive.id.spatialQueryData;
+							data.name = pickedObjects[0].primitive.id.name;
+							data.dom = pickedObjects[0].primitive.id.description;
+							// console.log(data);
+							var doms = $('#spatialQueryValuemain');
+							var domo = $('#spatialQueryValue');
+							doms.empty();
+							doms.append('<div>name:' + data.name + '<div/>' + data.dom._value);
+							domo.show();
 						}
 					}
 				}

--
Gitblit v1.9.3