From db45def58993c3ed79b47f1a0ec19740ec229211 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 11 Jun 2021 11:22:24 +0800
Subject: [PATCH] 工具下面做相关更改,及逻辑优化

---
 widgets/Tool/Widget.js |  137 +++++++++++++++++++++++++++++----------------
 1 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index cf99f21..6d79f73 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -39,78 +39,119 @@
 
 				// 图上量算
 				$('.measure-tool').click(function () {
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Measurement').show();
+
+					// 关闭卷帘
+					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-SplitScreen').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle()
+					$('.jimu-widget-CoorPosition').hide();
+					$('.jimu-widget-MapPrinting').hide();
+
+					$('.jimu-widget-Measurement').show();
+
+					$('.tool-y-box').stop().hide();
+
 				})
-
-
 
 				// 卷帘对比
 				$('.rolling-tool').click(function () {
+
+					// 关闭量算
+					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('openRolling', 'Rolling');
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Rolling').show();
-					$('.jimu-widget-Measurement').hide();
-					$('.jimu-widget-FlyRoute').hide();
-					$('.jimu-widget-SplitScreen').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle();
+
+					$('.tool-y-box').stop().hide();
+
+				})
+
+				// 分屏对比
+				$('.splitScreen-tool').click(function () {
+					// 关闭量算
+					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('openSplitScreen', 'SplitScreen');
+
+					$('.tool-y-box').stop().hide();
 				})
 
 				// 我的标记
 				$('.sign-tool').click(function () {
+
+					// 关闭量算
+					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('openSign', 'Sign');
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Sign').show();
-					$('.jimu-widget-Measurement').hide();
-					$('.jimu-widget-FlyRoute').hide();
-					$('.jimu-widget-SplitScreen').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle()
+
+					$('.tool-y-box').stop().hide();
+
 				})
 
 				// 坐标定位
 				$('.CoorPosition-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-MapPrinting').hide();
 					$('.jimu-widget-CoorPosition').show();
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Measurement').hide();
-					$('.jimu-widget-Sign').hide();
-					$('.jimu-widget-FlyRoute').hide();
-					$('.jimu-widget-SplitScreen').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle()
+
+					$('.tool-y-box').stop().hide();
+
 				})
 
 
 				// 地图打印
 				$('.MapPrinting-tool').click(function () {
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-MapPrinting').show();
+
+					// 关闭量算
+					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();
-					$('.jimu-widget-SplitScreen').hide();
-					$('.tool-y-box').toggle()
+					$('.jimu-widget-MapPrinting').show();
+
+					$('.tool-y-box').stop().hide();
+
 				})
 
-				// 分屏对比
-				$('.splitScreen-tool').click(function () {
-					$('.jimu-widget-SplitScreen').show();
-					$('.jimu-widget-CoorPosition').hide();
-					$('.jimu-widget-Location').hide();
-					$('.jimu-widget-Measurement').hide();
-					$('.jimu-widget-Sign').hide();
-					$('.jimu-widget-FlyRoute').hide();
-					$('.jimu-widget-DynamicRiver').hide();
-					$('.tool-y-box').toggle()
-				})
+
 
 			},
 

--
Gitblit v1.9.3