From c3bb18b5acb4c8453c6f86a376dd37bd93ae3bc3 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 22 Jun 2021 10:13:53 +0800
Subject: [PATCH] 空间分析关闭逻辑修改

---
 widgets/Tool/Widget.js |  246 +++++++++++++++++++++++++++++-------------------
 1 files changed, 149 insertions(+), 97 deletions(-)

diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 590d014..72020cb 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -51,14 +51,18 @@
 					$('.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();
+				
+					
+					that.closefenxi();
+
+
 					$('.tool-y-box').stop().hide();
+					//关闭飞行
+					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					topic.publish('closeFly', 'closeFly');
+
+
+
 
 					$('.jimu-widget-Measurement').show();
 
@@ -78,14 +82,15 @@
 					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();
+					
+					
+					that.closefenxi();
+
+
 					$('.tool-y-box').stop().hide();
+					//关闭飞行
+					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					topic.publish('closeFly', 'closeFly');
 
 					topic.publish('openRolling', 'Rolling');
 
@@ -104,14 +109,15 @@
 					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();
+				
+					
+					that.closefenxi();
+
+
 					$('.tool-y-box').stop().hide();
+					//关闭飞行
+					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					topic.publish('closeFly', 'closeFly');
 
 					topic.publish('openSplitScreen', 'SplitScreen');
 
@@ -130,14 +136,15 @@
 					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();
+					
+					
+					that.closefenxi();
+
+
 					$('.tool-y-box').stop().hide();
+					//关闭飞行
+					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					topic.publish('closeFly', 'closeFly');
 
 					topic.publish('openSign', 'Sign');
 
@@ -158,14 +165,15 @@
 					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();
+					
+					
+					that.closefenxi();
+
+
 					$('.tool-y-box').stop().hide();
+					//关闭飞行
+					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					topic.publish('closeFly', 'closeFly');
 
 					$('.jimu-widget-CoorPosition').show();
 
@@ -185,24 +193,26 @@
 					topic.publish('closeSplitScreen', 'SplitScreen');
 					// 关闭标记
 					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();
+					
+					
+					that.closefenxi();
+
+
 					$('.tool-y-box').stop().hide();
+					//关闭飞行
+					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					topic.publish('closeFly', 'closeFly');
 
 					$('.jimu-widget-MapPrinting').show();
 
 
 				})
-
-				// 可视分析
-				$('.visibleArea-tool').click(function () {
+				// 空间分析
+				$('.spatialAnalysis-tool').click(function () {
 					that.map.scene.globe.depthTestAgainstTerrain = true;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
@@ -215,65 +225,92 @@
 					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();
+
+					that.closefenxi();
+
+
+					//关闭飞行
+					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					topic.publish('closeFly', 'closeFly');
+
+					$(".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-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();
+				// $('.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();
-				})
+				// 	$(".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();
+				// $('.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);
-				})
+				// 	$(".jimu-widget-slope").show();
+				// 	topic.publish('getbeginSlope', this.beginSlope);
+				// })
 
 			},
 
@@ -282,7 +319,22 @@
 					$('.tool-y-box').hide();
 				}
 			},
+			closefenxi: function () {
+				// 关闭可视
+				topic.publish('closev', '');
+				// 关闭剖面
+				topic.publish('closep', '');
+				// 关闭坡度
+				topic.publish('closes', '');
+				$(".jimu-widget-profileAnalysis").hide();
+				$(".jimu-widget-slope").hide();
+				$(".jimu-widget-visibleArea").hide();
+				$(".jimu-widget-spatialAnalysis").hide();
+				//清除实体
+				this.map.entities.removeAll();
+				$(".jimu-widget-modelDiagram").hide();
 
+			},
 			onOpen: function () {
 				//面板打开的时候触发 （when open this panel trigger）
 			},

--
Gitblit v1.9.3