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 |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 4289d78..590d014 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -51,6 +51,10 @@
 					$('.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();
@@ -64,6 +68,7 @@
 				// 卷帘对比
 				$('.rolling-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭分屏
@@ -73,6 +78,10 @@
 					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();
@@ -85,6 +94,7 @@
 
 				// 分屏对比
 				$('.splitScreen-tool').click(function () {
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -94,6 +104,10 @@
 					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();
@@ -106,6 +120,7 @@
 				// 我的标记
 				$('.sign-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -115,6 +130,10 @@
 					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();
@@ -128,6 +147,7 @@
 				// 坐标定位
 				$('.CoorPosition-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -138,6 +158,10 @@
 					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();
@@ -152,6 +176,7 @@
 				// 地图打印
 				$('.MapPrinting-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -162,6 +187,10 @@
 					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();
@@ -174,7 +203,7 @@
 
 				// 可视分析
 				$('.visibleArea-tool').click(function () {
-
+					that.map.scene.globe.depthTestAgainstTerrain = true;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -186,15 +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();
 				})
-
+				// 剖面分析
 				$('.profileAnalysis-tool').click(function () {
-
+					that.map.scene.globe.depthTestAgainstTerrain = true;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -206,15 +239,19 @@
 					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');
 					// 关闭卷帘
@@ -226,10 +263,14 @@
 					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