From c73ef140032acbcfb6c84c4a1ef1d42914a7957d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 21 Jun 2021 08:52:02 +0800
Subject: [PATCH] 添加动画关闭修改

---
 widgets/spatialAnalysis/Widget.js |  250 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 163 insertions(+), 87 deletions(-)

diff --git a/widgets/spatialAnalysis/Widget.js b/widgets/spatialAnalysis/Widget.js
index 448dc0b..98e0e0b 100644
--- a/widgets/spatialAnalysis/Widget.js
+++ b/widgets/spatialAnalysis/Widget.js
@@ -34,125 +34,171 @@
 				var domHtmls = [
 					{
 						name: '可视分析',
-						classs: 'visibleArea-tool'
+						classs: 'visibleArea-tool',
+						img: './images/addL/ksy.png'
 					}, {
 						name: '剖面分析',
-						classs: 'profileAnalysis-tool'
+						classs: 'profileAnalysis-tool',
+						img: './images/addL/剖面分析.png'
 					}, {
-						name: '坡度分析',
-						classs: 'slope-tool'
+						name: '建造实体',
+						classs: 'modelDiagram-tool',
+						img: './images/addL/pdpx.png'
 					}
+					// , {
+					// 	name: '坡度分析',
+					// 	classs: 'slope-tool',
+					// 	img: './images/addL/pdpx.png'
+					// }
 				];
 				var dom = $('#spatialAnalysis-main');
 				var str = '';
 				for (var k in domHtmls) {
 					str += `<li class="${domHtmls[k].classs}">
-					 <i></i>
+					 <i class="imgs">
+					 <img src="${domHtmls[k].img}" alt="">
+					 </i>
 					 <span>${domHtmls[k].name}</span>
 					 </li>`
 				}
 				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();
 				})
-
-
-				// topic.subscribe("closeTool", lang.hitch(this, this.closeToolBox));
-				// this.inherited(arguments);
-				// $('.tool-bar .tool-btn span').click(function () {
-				// 	topic.publish('closeMap', this.name);
-				// 	topic.publish('closeZtree', this.name);
-				// 	$('.tool-y-box').toggle();
-				// })
 
 				// 可视分析
 				$('.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();
+					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();
+					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();
+					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.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);
 				})
 
 			},
@@ -162,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