From 1a2c1d005bf7de2528f73638fb24d31da812aad5 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 22 Jun 2021 17:40:13 +0800
Subject: [PATCH] 增加模型

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

diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index ab3f608..d29725d 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -51,18 +51,28 @@
 					$('.jimu-widget-Sign').hide();
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").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();
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
 				// 卷帘对比
 				$('.rolling-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭分屏
@@ -72,17 +82,24 @@
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").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');
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
 				// 分屏对比
 				$('.splitScreen-tool').click(function () {
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -92,17 +109,24 @@
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").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');
 
-					$('.tool-y-box').stop().hide();
 				})
 
 				// 我的标记
 				$('.sign-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -112,18 +136,25 @@
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").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');
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
 				// 坐标定位
 				$('.CoorPosition-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -134,12 +165,18 @@
 					topic.publish('closeSign', 'Sign');
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-MapPrinting').hide();
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").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();
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
@@ -147,6 +184,7 @@
 				// 地图打印
 				$('.MapPrinting-tool').click(function () {
 
+					that.map.scene.globe.depthTestAgainstTerrain = false;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -155,20 +193,27 @@
 					topic.publish('closeSplitScreen', 'SplitScreen');
 					// 关闭标记
 					topic.publish('closeSign', 'Sign');
+
 					topic.publish('closeFlyRoute', 'FlyRoute');
+
 					$('.jimu-widget-CoorPosition').hide();
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").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();
 
-					$('.tool-y-box').stop().hide();
 
 				})
-
-				// 可视分析
-				$('.visibleArea-tool').click(function () {
-
+				// 空间分析
+				$('.spatialAnalysis-tool').click(function () {
+					that.map.scene.globe.depthTestAgainstTerrain = true;
 					// 关闭量算
 					topic.publish('closeMeasurement', 'Measurement');
 					// 关闭卷帘
@@ -180,29 +225,17 @@
 					topic.publish('closeFlyRoute', 'FlyRoute');
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
-					$(".jimu-widget-profileAnalysis").hide();
-
-					$(".jimu-widget-visibleArea").show();
 					$('.tool-y-box').stop().hide();
-				})
 
-				$('.profileAnalysis-tool').click(function () {
 
-					// 关闭量算
-					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();
-					$(".jimu-widget-visibleArea").hide();
-					
-					$(".jimu-widget-profileAnalysis").show();
-					$('.tool-y-box').stop().hide();
+					that.closefenxi();
+
+
+					//关闭飞行
+					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					topic.publish('closeFly', 'closeFly');
+
+					$(".jimu-widget-spatialAnalysis").show();
 				})
 
 			},
@@ -212,7 +245,14 @@
 					$('.tool-y-box').hide();
 				}
 			},
+			closefenxi: function () {
+				// 关闭空间分析页面
+				$(".jimu-widget-spatialAnalysis").hide();
+				// 关闭空间分析子元素
+				topic.publish('closeOnceUse');
 
+
+			},
 			onOpen: function () {
 				//面板打开的时候触发 (when open this panel trigger)
 			},

--
Gitblit v1.9.3