From d12e030d8a7690d79c5786bc2a786b6c21a24433 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Jun 2021 16:31:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 widgets/Tool/Widget.js |  172 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 129 insertions(+), 43 deletions(-)

diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 4289d78..d4b6ef3 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -51,10 +51,17 @@
 					$('.jimu-widget-Sign').hide();
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
+					// 关闭坡度
+					topic.publish('closes', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
 					$(".jimu-widget-slope").hide();
 					$('.tool-y-box').stop().hide();
+					$(".jimu-widget-spatialAnalysis").hide();
 
 					$('.jimu-widget-Measurement').show();
 
@@ -64,6 +71,7 @@
 				// 卷帘对比
 				$('.rolling-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭分屏
@@ -73,10 +81,17 @@
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
+					// 关闭坡度
+					topic.publish('closes', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
 					$(".jimu-widget-slope").hide();
 					$('.tool-y-box').stop().hide();
+					$(".jimu-widget-spatialAnalysis").hide();
 
 					topic.publish('openRolling', 'Rolling');
 
@@ -85,6 +100,7 @@
 
 				// 分屏对比
 				$('.splitScreen-tool').click(function () {
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -94,10 +110,17 @@
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
+					// 关闭坡度
+					topic.publish('closes', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
 					$(".jimu-widget-slope").hide();
 					$('.tool-y-box').stop().hide();
+					$(".jimu-widget-spatialAnalysis").hide();
 
 					topic.publish('openSplitScreen', 'SplitScreen');
 
@@ -106,6 +129,7 @@
 				// 我的标记
 				$('.sign-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -115,10 +139,17 @@
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
+					// 关闭坡度
+					topic.publish('closes', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
 					$(".jimu-widget-slope").hide();
 					$('.tool-y-box').stop().hide();
+					$(".jimu-widget-spatialAnalysis").hide();
 
 					topic.publish('openSign', 'Sign');
 
@@ -128,6 +159,7 @@
 				// 坐标定位
 				$('.CoorPosition-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -138,10 +170,17 @@
 					topic.publish('closeSign', 'Sign');
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-MapPrinting').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
+					// 关闭坡度
+					topic.publish('closes', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
 					$(".jimu-widget-slope").hide();
 					$('.tool-y-box').stop().hide();
+					$(".jimu-widget-spatialAnalysis").hide();
 
 					$('.jimu-widget-CoorPosition').show();
 
@@ -152,6 +191,7 @@
 				// 地图打印
 				$('.MapPrinting-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -162,19 +202,25 @@
 					topic.publish('closeSign', 'Sign');
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
+					// 关闭坡度
+					topic.publish('closes', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
 					$(".jimu-widget-slope").hide();
 					$('.tool-y-box').stop().hide();
+					$(".jimu-widget-spatialAnalysis").hide();
 
 					$('.jimu-widget-MapPrinting').show();
 
 
 				})
-
-				// 可视分析
-				$('.visibleArea-tool').click(function () {
-
+				// 空间分析
+				$('.spatialAnalysis-tool').click(function () {
+					that.map.scene.globe.depthTestAgainstTerrain = true;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -186,53 +232,93 @@
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
+					// 关闭坡度
+					topic.publish('closes', '');
 					$(".jimu-widget-profileAnalysis").hide();
 					$(".jimu-widget-slope").hide();
 					$('.tool-y-box').stop().hide();
-
-					$(".jimu-widget-visibleArea").show();
-				})
-
-				$('.profileAnalysis-tool').click(function () {
-
-					// 关闭量算
-					topic.publish('closeMeasurement', 'Measurement');
-					// 关闭卷帘
-					topic.publish('closeRolling', 'Rolling');
-					// 关闭分屏
-					topic.publish('closeSplitScreen', 'SplitScreen');
-					// 关闭标记
-					topic.publish('closeSign', 'Sign');
-					topic.publish('closeFlyRoute', 'FlyRoute');
-					$('.jimu-widget-CoorPosition').hide();
-					$('.jimu-widget-MapPrinting').hide();
 					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-slope").hide();
-					$('.tool-y-box').stop().hide();
 					
-					$(".jimu-widget-profileAnalysis").show();
+					$(".jimu-widget-spatialAnalysis").show();
 				})
 
-				$('.slope-tool').click(function () {
+				// // 可视分析
+				// $('.visibleArea-tool').click(function () {
+				// 	that.map.scene.globe.depthTestAgainstTerrain = true;
+				// 	// 关闭量算
+				// 	topic.publish('closeMeasurement', 'Measurement');
+				// 	// 关闭卷帘
+				// 	topic.publish('closeRolling', 'Rolling');
+				// 	// 关闭分屏
+				// 	topic.publish('closeSplitScreen', 'SplitScreen');
+				// 	// 关闭标记
+				// 	topic.publish('closeSign', 'Sign');
+				// 	topic.publish('closeFlyRoute', 'FlyRoute');
+				// 	$('.jimu-widget-CoorPosition').hide();
+				// 	$('.jimu-widget-MapPrinting').hide();
+				// 	// 关闭可视
+				// 	// topic.publish('closev', '');
+				// 	// 关闭剖面
+				// 	topic.publish('closep', '');
+				// 	$(".jimu-widget-profileAnalysis").hide();
+				// 	$(".jimu-widget-slope").hide();
+				// 	$('.tool-y-box').stop().hide();
 
-					// 关闭量算
-					topic.publish('closeMeasurement', 'Measurement');
-					// 关闭卷帘
-					topic.publish('closeRolling', 'Rolling');
-					// 关闭分屏
-					topic.publish('closeSplitScreen', 'SplitScreen');
-					// 关闭标记
-					topic.publish('closeSign', 'Sign');
-					topic.publish('closeFlyRoute', 'FlyRoute');
-					$('.jimu-widget-CoorPosition').hide();
-					$('.jimu-widget-MapPrinting').hide();
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").hide();
-					$('.tool-y-box').stop().hide();
-					
-					$(".jimu-widget-slope").show();
-					topic.publish('getbeginSlope', this.beginSlope);
-				})
+				// 	$(".jimu-widget-visibleArea").show();
+				// })
+				// 剖面分析
+				// $('.profileAnalysis-tool').click(function () {
+				// 	that.map.scene.globe.depthTestAgainstTerrain = true;
+				// 	// 关闭量算
+				// 	topic.publish('closeMeasurement', 'Measurement');
+				// 	// 关闭卷帘
+				// 	topic.publish('closeRolling', 'Rolling');
+				// 	// 关闭分屏
+				// 	topic.publish('closeSplitScreen', 'SplitScreen');
+				// 	// 关闭标记
+				// 	topic.publish('closeSign', 'Sign');
+				// 	topic.publish('closeFlyRoute', 'FlyRoute');
+				// 	$('.jimu-widget-CoorPosition').hide();
+				// 	$('.jimu-widget-MapPrinting').hide();
+				// 	// 关闭可视
+				// 	topic.publish('closev', '');
+				// 	// 关闭剖面
+				// 	// topic.publish('closep', '');
+				// 	$(".jimu-widget-visibleArea").hide();
+				// 	$(".jimu-widget-slope").hide();
+				// 	$('.tool-y-box').stop().hide();
+
+				// 	$(".jimu-widget-profileAnalysis").show();
+				// })
+				//坡度分析
+				// $('.slope-tool').click(function () {
+				// 	that.map.scene.globe.depthTestAgainstTerrain = true;
+				// 	// 关闭量算
+				// 	topic.publish('closeMeasurement', 'Measurement');
+				// 	// 关闭卷帘
+				// 	topic.publish('closeRolling', 'Rolling');
+				// 	// 关闭分屏
+				// 	topic.publish('closeSplitScreen', 'SplitScreen');
+				// 	// 关闭标记
+				// 	topic.publish('closeSign', 'Sign');
+				// 	topic.publish('closeFlyRoute', 'FlyRoute');
+				// 	$('.jimu-widget-CoorPosition').hide();
+				// 	$('.jimu-widget-MapPrinting').hide();
+				// 	// 关闭可视
+				// 	topic.publish('closev', '');
+				// 	// 关闭剖面
+				// 	topic.publish('closep', '');
+				// 	$(".jimu-widget-visibleArea").hide();
+				// 	$(".jimu-widget-profileAnalysis").hide();
+				// 	$('.tool-y-box').stop().hide();
+
+				// 	$(".jimu-widget-slope").show();
+				// 	topic.publish('getbeginSlope', this.beginSlope);
+				// })
 
 			},
 

--
Gitblit v1.9.3