From 9dd06fefff5262947d42e99f518706d4a068d654 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 23 Jun 2021 11:27:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 widgets/spatialAnalysis/Widget.js |   93 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/widgets/spatialAnalysis/Widget.js b/widgets/spatialAnalysis/Widget.js
index 31006bf..92882b0 100644
--- a/widgets/spatialAnalysis/Widget.js
+++ b/widgets/spatialAnalysis/Widget.js
@@ -31,6 +31,53 @@
 				var that = this;
 				// 暴露在外的接口
 
+				topic.subscribe("closeOnceUse", lang.hitch(this, this.closeOnceUse));
+
+				// 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;//全局使用
+
 				var domHtmls = [//默认
 					{
 						name: '可视分析',
@@ -62,10 +109,18 @@
 						classs: 'digTheEarth-tool',
 						img: './images/addL/pdpx.png'
 					}
+					// , {//方量分析//做好
+					// 	name: '方量分析',
+					// 	classs: 'volumeAnalysis-tool',
+					// 	img: './images/addL/pdpx.png'
+					// }
 				];
 
 				that.beginSpatialAnalysis(domHtmls);
 				var isit = false;
+				$('.ccslius').click(() => {
+					isit = false;
+				})
 				$('.ccsliu').dblclick(() => {//测试开关 点击图例其他的图片
 
 					if (isit) {
@@ -98,6 +153,15 @@
 							, {//地形开挖,//做好
 								name: '地形开挖',
 								classs: 'digTheEarth-tool',
+								img: './images/addL/pdpx.png'
+							}, {//方量分析//做好
+								name: '方量分析',
+								classs: 'volumeAnalysis-tool',
+								img: './images/addL/pdpx.png'
+							}
+							, {//空间查询
+								name: '空间查询',
+								classs: 'spatialQuery-tool',
 								img: './images/addL/pdpx.png'
 							}
 							,
@@ -196,8 +260,22 @@
 				$('.digTheEarth-tool').click(function () {
 					that.closeOnceUse('digTheEarth');
 					$(".jimu-widget-digTheEarth").show();
-					topic.publish('beginDigTheEarth', 'beginDigTheEarth');
+					// topic.publish('beginDigTheEarth', 'beginDigTheEarth');
 
+				})
+
+				//方量分析
+				$('.volumeAnalysis-tool').click(function () {
+					that.closeOnceUse('volumeAnalysis');
+					$(".jimu-widget-volumeAnalysis").show();
+					topic.publish('beginVolumeAnalysis', 'beginVolumeAnalysis');
+				})
+
+				//空间查询
+				$('.spatialQuery-tool').click(function () {
+					that.closeOnceUse();
+					$(".jimu-widget-spatialQuery").show();
+					topic.publish('beginSpatialQuery', 'beginSpatialQuery');
 				})
 
 			},
@@ -240,10 +318,21 @@
 				$(".jimu-widget-SQLQuery").hide();
 				topic.publish('closesSQL', 'closesSQL');
 				//关闭地形开挖
-				if (who != 'digTheEarth') {
+				if ($(".jimu-widget-digTheEarth").is(":visible")) {//判断是否隐藏
 					$(".jimu-widget-digTheEarth").hide();
 					topic.publish('closesDigTheEarth');
 				}
+				//关闭方量贩分析
+				if ($(".jimu-widget-volumeAnalysis").is(":visible")) {//判断是否隐藏
+					$(".jimu-widget-volumeAnalysis").hide();
+					topic.publish('closesVolumeAnalysis');
+				}
+				//关闭空间查询
+				if ($(".jimu-widget-spatialQuery").is(":visible")) {//判断是否隐藏
+					$(".jimu-widget-spatialQuery").hide();
+					topic.publish('closesSpatialQuery');
+				}
+
 
 			},
 			onOpen: function () {

--
Gitblit v1.9.3