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 |  153 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 137 insertions(+), 16 deletions(-)

diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 7c22602..590d014 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -3,16 +3,16 @@
 // 模块描述:显示坐标
 ///////////////////////////////////////////////////////////////////////////
 define([
-		'dojo/_base/declare',
-		'dojo/_base/lang',
-		'dojo/_base/array',
-		'dojo/_base/html',
-		'dojo/topic',
-		'jimu/BaseWidget',
-		'jimu/utils',
-		'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
-		'libs/zTree_v3/js/jquery.ztree.all'
-	],
+	'dojo/_base/declare',
+	'dojo/_base/lang',
+	'dojo/_base/array',
+	'dojo/_base/html',
+	'dojo/topic',
+	'jimu/BaseWidget',
+	'jimu/utils',
+	'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
+	'libs/zTree_v3/js/jquery.ztree.all'
+],
 	function (declare,
 		lang,
 		array,
@@ -51,16 +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');
 					// 关闭分屏
@@ -70,15 +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');
 					// 关闭卷帘
@@ -88,15 +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');
 					// 关闭卷帘
@@ -106,16 +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');
 					// 关闭卷帘
@@ -126,9 +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();
 
 				})
 
@@ -136,6 +176,7 @@
 				// 地图打印
 				$('.MapPrinting-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -146,13 +187,93 @@
 					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');
+					// 关闭卷帘
+					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();
 
+					$(".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