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

diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index c6f1600..d4b6ef3 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -28,6 +28,7 @@
 			name: 'Tool',
 			layers: {},
 			startup: function () {
+				var that = this;
 				// 暴露在外的接口
 				topic.subscribe("closeTool", lang.hitch(this, this.closeToolBox));
 				this.inherited(arguments);
@@ -39,84 +40,286 @@
 
 				// 图上量算
 				$('.measure-tool').click(function () {
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Measurement').show();
+					that.map.scene.globe.depthTestAgainstTerrain = false;
+					// 关闭卷帘
+					topic.publish('closeRolling', 'Rolling');
+					// 关闭分屏
+					topic.publish('closeSplitScreen', 'SplitScreen');
+					// 关闭标记
+					topic.publish('closeSign', 'Sign');
+					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-Sign').hide();
-					$('.jimu-widget-FlyRoute').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle()
-				})
+					$('.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();
+
+
+				})
 
 				// 卷帘对比
 				$('.rolling-tool').click(function () {
+
+					that.map.scene.globe.depthTestAgainstTerrain = false;
+					// 关闭量算
+					topic.publish('closeMeasurement', 'Measurement');
+					// 关闭分屏
+					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', '');
+					// 关闭坡度
+					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');
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Rolling').show();
-					$('#widgets_Rolling_Widget_17').show();
-					$('.jimu-widget-Measurement').hide();
-					$('.jimu-widget-FlyRoute').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle();
+
+
+				})
+
+				// 分屏对比
+				$('.splitScreen-tool').click(function () {
+					that.map.scene.globe.depthTestAgainstTerrain = false;
+					// 关闭量算
+					topic.publish('closeMeasurement', 'Measurement');
+					// 关闭卷帘
+					topic.publish('closeRolling', 'Rolling');
+					// 关闭标记
+					topic.publish('closeSign', 'Sign');
+					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');
+
 				})
 
 				// 我的标记
 				$('.sign-tool').click(function () {
+
+					that.map.scene.globe.depthTestAgainstTerrain = false;
+					// 关闭量算
+					topic.publish('closeMeasurement', 'Measurement');
+					// 关闭卷帘
+					topic.publish('closeRolling', 'Rolling');
+					// 关闭分屏
+					topic.publish('closeSplitScreen', 'SplitScreen');
+					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');
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Sign').show();
-					$('.jimu-widget-Measurement').hide();
-					$('.jimu-widget-FlyRoute').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle()
+
+
 				})
 
 				// 坐标定位
 				$('.CoorPosition-tool').click(function () {
+
+					that.map.scene.globe.depthTestAgainstTerrain = false;
+					// 关闭量算
+					topic.publish('closeMeasurement', 'Measurement');
+					// 关闭卷帘
+					topic.publish('closeRolling', 'Rolling');
+					// 关闭分屏
+					topic.publish('closeSplitScreen', 'SplitScreen');
+					// 关闭标记
+					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();
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Measurement').hide();
-					$('.jimu-widget-Sign').hide();
-					$('.jimu-widget-FlyRoute').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle()
+
+
 				})
 
-				// 查询定位
-				// $('.location-tool').click(function () {
-				// 	$('.jimu-widget-Location').show();
-
-				// 	$('.jimu-widget-FlyRoute').hide();
-				// 	$('.jimu-widget-Sign').hide();
-				// 	$('.jimu-widget-DynamicRiver').hide();
-				// 	$('.jimu-widget-Measurement').hide();
-				// 	$('.tool-y-box').toggle()
-				// })
 
 				// 地图打印
-				// $('.MapPrinting-tool').click(function () {
-				// 	$('.jimu-widget-Location').hide();
-				// 	$('.jimu-widget-MapPrinting').show();
+				$('.MapPrinting-tool').click(function () {
+
+					that.map.scene.globe.depthTestAgainstTerrain = false;
+					// 关闭量算
+					topic.publish('closeMeasurement', 'Measurement');
+					// 关闭卷帘
+					topic.publish('closeRolling', 'Rolling');
+					// 关闭分屏
+					topic.publish('closeSplitScreen', 'SplitScreen');
+					// 关闭标记
+					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();
+
+
+				})
+				// 空间分析
+				$('.spatialAnalysis-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', '');
+					// 关闭坡度
+					topic.publish('closes', '');
+					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
+					$(".jimu-widget-visibleArea").hide();
+					
+					$(".jimu-widget-spatialAnalysis").show();
+				})
+
+				// // 可视分析
+				// $('.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-Measurement').hide();
-				// 	$('.jimu-widget-Sign').hide();
-				// 	$('.jimu-widget-FlyRoute').hide();
-				// 	$('.jimu-widget-DynamicRiver').hide();
-				// 	$('.tool-y-box').toggle()
+				// 	$('.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);
 				// })
 
-				// 路线导航
-				// $('.RouteNavigate-tool').click(function () {
-				// 	$('.jimu-widget-RouteNavigate').show();
-				// 	$('.jimu-widget-MapPrinting').hide();
-				// 	$('.jimu-widget-CoorPosition').hide();
-				// 	$('.jimu-widget-Measurement').hide();
-				// 	$('.jimu-widget-Sign').hide();
-				// 	$('.jimu-widget-FlyRoute').hide();
-				// 	$('.jimu-widget-DynamicRiver').hide();
-				// 	$('.tool-y-box').toggle()
-				// })
 			},
 
 			closeToolBox: function (item) {

--
Gitblit v1.9.3