From 0de0c63175ba63fd7f7fcec97d65124fb3b455dd Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 19 Jun 2021 17:57:42 +0800
Subject: [PATCH] 创建实体调整

---
 widgets/spatialAnalysis/Widget.js |  255 +++++++++++++++++++++++++++++---------------------
 1 files changed, 147 insertions(+), 108 deletions(-)

diff --git a/widgets/spatialAnalysis/Widget.js b/widgets/spatialAnalysis/Widget.js
index 5a6534b..98e0e0b 100644
--- a/widgets/spatialAnalysis/Widget.js
+++ b/widgets/spatialAnalysis/Widget.js
@@ -40,8 +40,12 @@
 						name: '剖面分析',
 						classs: 'profileAnalysis-tool',
 						img: './images/addL/剖面分析.png'
+					}, {
+						name: '建造实体',
+						classs: 'modelDiagram-tool',
+						img: './images/addL/pdpx.png'
 					}
-                    // , {
+					// , {
 					// 	name: '坡度分析',
 					// 	classs: 'slope-tool',
 					// 	img: './images/addL/pdpx.png'
@@ -60,133 +64,138 @@
 				dom.replaceWith(str);
 
 				$('.closesspatialAnalysis').click(() => {
+					that.closeOnceUse();
 					$('.jimu-widget-spatialAnalysis').hide();
-					// 关闭可视
-					topic.publish('closev', '');
-					// 关闭剖面
-					topic.publish('closep', '');
-					// 关闭坡度
-					topic.publish('closes', '');
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").hide();
-					$(".jimu-widget-slope").hide();
+					// // 关闭可视
+					// topic.publish('closev', '');
+					// // 关闭剖面
+					// topic.publish('closep', '');
+					// // 关闭坡度
+					// topic.publish('closes', '');
+					// $(".jimu-widget-visibleArea").hide();
+					// $(".jimu-widget-profileAnalysis").hide();
+					// $(".jimu-widget-slope").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', '');
-					// 关闭坡度
-					topic.publish('closes', '');
-					$(".jimu-widget-profileAnalysis").hide();
-					$(".jimu-widget-slope").hide();
-					$('.tool-y-box').stop().hide();
-					//关闭飞行
-					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
-					topic.publish('closeFly', 'closeFly');
+					that.closeOnceUse();
+					// 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-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					// topic.publish('closeFly', 'closeFly');
 
 					$(".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', '');
-					// 关闭坡度
-					topic.publish('closes', '');
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-slope").hide();
-					$('.tool-y-box').stop().hide();
-					//关闭飞行
-					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
-					topic.publish('closeFly', 'closeFly');
+					that.closeOnceUse();
+					// 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-visibleArea").hide();
+					// $(".jimu-widget-slope").hide();
+					// $('.tool-y-box').stop().hide();
+					// //关闭飞行
+					// $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					// topic.publish('closeFly', 'closeFly');
 
 					$(".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', '');
-					// 关闭坡度
-					// topic.publish('closes', '');
-					$(".jimu-widget-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").hide();
-					$('.tool-y-box').stop().hide();
-					//关闭飞行
-					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
-					topic.publish('closeFly', 'closeFly');
+					that.closeOnceUse();
+					// 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-visibleArea").hide();
+					// $(".jimu-widget-profileAnalysis").hide();
+					// $('.tool-y-box').stop().hide();
+					// //关闭飞行
+					// $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					// topic.publish('closeFly', 'closeFly');
 
 					$(".jimu-widget-slope").show();
 					topic.publish('getbeginSlope', this.beginSlope);
 				})
 				//模型
 				$('.modelDiagram-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-visibleArea").hide();
-					$(".jimu-widget-profileAnalysis").hide();
-					$('.tool-y-box').stop().hide();
-					$(".jimu-widget-slope").hide();
-					//关闭飞行
-					$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
-					topic.publish('closeFly', 'closeFly');
+					that.closeOnceUse();
+					// 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-visibleArea").hide();
+					// $(".jimu-widget-profileAnalysis").hide();
+					// $('.tool-y-box').stop().hide();
+					// $(".jimu-widget-slope").hide();
+					// //关闭飞行
+					// $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+					// topic.publish('closeFly', 'closeFly');
 
 					$('.jimu-widget-modelDiagram').show();
 					// topic.publish('getbeginSlope', this.beginSlope);
@@ -199,7 +208,37 @@
 					$('.tool-y-box').hide();
 				}
 			},
-
+			closeOnceUse: function () {
+				var that = this;
+				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-visibleArea").hide();
+				$(".jimu-widget-profileAnalysis").hide();
+				$(".jimu-widget-slope").hide();
+				$('.tool-y-box').stop().hide();
+				//关闭飞行
+				$('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+				topic.publish('closeFly', 'closeFly');
+				//清除实体
+				this.map.entities.removeAll();
+				$(".jimu-widget-modelDiagram").hide();
+			},
 			onOpen: function () {
 				//面板打开的时候触发 （when open this panel trigger）
 				// var domHtmls = [

--
Gitblit v1.9.3