From e55ebf07a49b024fe7d2cebc0499bd949c7b55bb Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 17 Jun 2021 18:08:32 +0800
Subject: [PATCH] 工具切换关闭细节调整

---
 widgets/Tool/Widget.js |   94 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index ab3f608..590d014 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -51,18 +51,24 @@
 					$('.jimu-widget-Sign').hide();
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					$('.jimu-widget-Measurement').show();
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
 				// 卷帘对比
 				$('.rolling-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭分屏
@@ -72,17 +78,23 @@
 					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();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					topic.publish('openRolling', 'Rolling');
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
 				// 分屏对比
 				$('.splitScreen-tool').click(function () {
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -92,17 +104,23 @@
 					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();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					topic.publish('openSplitScreen', 'SplitScreen');
 
-					$('.tool-y-box').stop().hide();
 				})
 
 				// 我的标记
 				$('.sign-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -112,18 +130,24 @@
 					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();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					topic.publish('openSign', 'Sign');
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
 				// 坐标定位
 				$('.CoorPosition-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -134,12 +158,17 @@
 					topic.publish('closeSign', 'Sign');
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-MapPrinting').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					$('.jimu-widget-CoorPosition').show();
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
@@ -147,6 +176,7 @@
 				// 地图打印
 				$('.MapPrinting-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -157,18 +187,23 @@
 					topic.publish('closeSign', 'Sign');
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
+					// 关闭可视
+					topic.publish('closev', '');
+					// 关闭剖面
+					topic.publish('closep', '');
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					$('.jimu-widget-MapPrinting').show();
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
 				// 可视分析
 				$('.visibleArea-tool').click(function () {
-
+					that.map.scene.globe.depthTestAgainstTerrain = true;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -180,14 +215,19 @@
 					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();
 
 					$(".jimu-widget-visibleArea").show();
-					$('.tool-y-box').stop().hide();
 				})
-
+				// 剖面分析
 				$('.profileAnalysis-tool').click(function () {
-
+					that.map.scene.globe.depthTestAgainstTerrain = true;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -199,10 +239,40 @@
 					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").show();
+					$(".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