From 0163b28ce3a2e0186b82e02fd8f98f8d9ee55340 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 22 Jun 2021 17:41:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 widgets/spatialAnalysis/Widget.js |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/widgets/spatialAnalysis/Widget.js b/widgets/spatialAnalysis/Widget.js
index 5604cbd..95e1228 100644
--- a/widgets/spatialAnalysis/Widget.js
+++ b/widgets/spatialAnalysis/Widget.js
@@ -31,6 +31,8 @@
 				var that = this;
 				// 暴露在外的接口
 
+                topic.subscribe("closeOnceUse", lang.hitch(this, this.closeOnceUse));
+
 				function createTooltip(frameDiv) {//抄录createTooltip函数
 
 					var tooltip = function (frameDiv) {
@@ -149,6 +151,10 @@
 								name: '地形开挖',
 								classs: 'digTheEarth-tool',
 								img: './images/addL/pdpx.png'
+							}, {//方量分析//做好
+								name: '方量分析',
+								classs: 'volumeAnalysis-tool',
+								img: './images/addL/pdpx.png'
 							}
 							,
 							{//建造模型
@@ -160,15 +166,6 @@
 							{//清除模型
 								name: '清除模型',
 								classs: 'modesssss2222',
-								img: './images/addL/pdpx.png'
-							}
-							, {//地形开挖,//做好
-								name: '地形开挖',
-								classs: 'digTheEarth-tool',
-								img: './images/addL/pdpx.png'
-							}, {//方量分析//做好
-								name: '方量分析',
-								classs: 'volumeAnalysis-tool',
 								img: './images/addL/pdpx.png'
 							}
 						];
@@ -255,7 +252,7 @@
 				$('.digTheEarth-tool').click(function () {
 					that.closeOnceUse('digTheEarth');
 					$(".jimu-widget-digTheEarth").show();
-					topic.publish('beginDigTheEarth', 'beginDigTheEarth');
+					// topic.publish('beginDigTheEarth', 'beginDigTheEarth');
 
 				})
 
@@ -309,7 +306,6 @@
 				if ($(".jimu-widget-digTheEarth").is(":visible")) {//判断是否隐藏
 					$(".jimu-widget-digTheEarth").hide();
 					topic.publish('closesDigTheEarth');
-					console.log('dakai ')
 				}
 
 				//关闭方量贩分析

--
Gitblit v1.9.3