From 2f4ba4558f75706cd80752dd78a80bb308312933 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 17 Jun 2021 17:28:45 +0800
Subject: [PATCH] 坡度分析   暂时不可关闭 可刷新页面取消工具

---
 widgets/slope/css/style.css           |   17 +++++---
 widgets/Tool/Widget.html              |    1 
 widgets/Tool/Widget.js                |   43 ++++++++++++++++++---
 widgets/legends/Widget.js             |    6 ---
 widgets/Layermanagement/css/style.css |    2 
 widgets/slope/Widget.js               |    1 
 6 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/widgets/Layermanagement/css/style.css b/widgets/Layermanagement/css/style.css
index ff596e2..f460215 100644
--- a/widgets/Layermanagement/css/style.css
+++ b/widgets/Layermanagement/css/style.css
@@ -1,5 +1,5 @@
 .jimu-widget-Layermanagement {
-    
+    display: none;
 }
 
 .jimu-widget-Layermanagement .layer-tab {
diff --git a/widgets/Tool/Widget.html b/widgets/Tool/Widget.html
index 840ff09..f296b9a 100644
--- a/widgets/Tool/Widget.html
+++ b/widgets/Tool/Widget.html
@@ -12,6 +12,7 @@
 				<li class="MapPrinting-tool"><i></i> <span>场景快照</span></li>
 				<li class="visibleArea-tool"><i></i> <span>可视分析</span></li>
 				<li class="profileAnalysis-tool"><i></i> <span>剖面分析</span></li>
+				<li class="slope-tool"><i></i> <span>坡度分析</span></li>
 				<!-- <li class="superposition-tool"><i></i> <span>叠加分析</span></li>
 				<li class="buffer-tool"><i></i> <span>缓冲分析</span></li> -->
 			</ul>
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index ab3f608..4289d78 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -53,10 +53,11 @@
 					$('.jimu-widget-MapPrinting').hide();
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					$('.jimu-widget-Measurement').show();
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
@@ -74,10 +75,11 @@
 					$('.jimu-widget-MapPrinting').hide();
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					topic.publish('openRolling', 'Rolling');
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
@@ -94,10 +96,11 @@
 					$('.jimu-widget-MapPrinting').hide();
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					topic.publish('openSplitScreen', 'SplitScreen');
 
-					$('.tool-y-box').stop().hide();
 				})
 
 				// 我的标记
@@ -114,10 +117,11 @@
 					$('.jimu-widget-MapPrinting').hide();
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					topic.publish('openSign', 'Sign');
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
@@ -136,10 +140,11 @@
 					$('.jimu-widget-MapPrinting').hide();
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					$('.jimu-widget-CoorPosition').show();
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
@@ -159,10 +164,11 @@
 					$('.jimu-widget-CoorPosition').hide();
 					$(".jimu-widget-visibleArea").hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					$('.jimu-widget-MapPrinting').show();
 
-					$('.tool-y-box').stop().hide();
 
 				})
 
@@ -181,9 +187,10 @@
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
 					$(".jimu-widget-profileAnalysis").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 
 					$(".jimu-widget-visibleArea").show();
-					$('.tool-y-box').stop().hide();
 				})
 
 				$('.profileAnalysis-tool').click(function () {
@@ -200,9 +207,31 @@
 					$('.jimu-widget-CoorPosition').hide();
 					$('.jimu-widget-MapPrinting').hide();
 					$(".jimu-widget-visibleArea").hide();
+					$(".jimu-widget-slope").hide();
+					$('.tool-y-box').stop().hide();
 					
 					$(".jimu-widget-profileAnalysis").show();
+				})
+
+				$('.slope-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").hide();
 					$('.tool-y-box').stop().hide();
+					
+					$(".jimu-widget-slope").show();
+					topic.publish('getbeginSlope', this.beginSlope);
 				})
 
 			},
diff --git a/widgets/legends/Widget.js b/widgets/legends/Widget.js
index 8c847b8..cc5440d 100644
--- a/widgets/legends/Widget.js
+++ b/widgets/legends/Widget.js
@@ -31,12 +31,6 @@
 				// 暴露在外的接口
 				topic.subscribe("getLegendsData", lang.hitch(this, this.onGetLegendsData));
 
-				$('.ccsliu').click(() => {
-					topic.publish('getbeginSlope', this.beginSlope);
-					$('.jimu-widget-slope').show();
-				})
-
-
 			},
 			onGetLegendsData: function (item) {
 				var val = item == '  ' ? '' : item;
diff --git a/widgets/slope/Widget.js b/widgets/slope/Widget.js
index cf5dfc6..8ea8799 100644
--- a/widgets/slope/Widget.js
+++ b/widgets/slope/Widget.js
@@ -299,6 +299,7 @@
 
             onClose: function () {
                 //面板关闭的时候触发 (when this panel is closed trigger)
+                console.log('jies')
             },
 
             onMinimize: function () {
diff --git a/widgets/slope/css/style.css b/widgets/slope/css/style.css
index 79aebce..e0d05c8 100644
--- a/widgets/slope/css/style.css
+++ b/widgets/slope/css/style.css
@@ -1,19 +1,22 @@
 .jimu-widget-slope {
   position: fixed !important;
-  top: 100px !important;
-  right: 50px !important;
+  top: 96px !important;
+  right: 10px !important;
   width: 200px !important;
   height: 40px !important;
-  background-color: rgb(218, 218, 218);
+  background-color: rgb(255, 255, 255);
   font-size: 14px;
-  /* border: 1px solid rgb(69, 154, 251); */
-  /* opacity      : .8; */
   color: rgb(0, 0, 0);
   font-size: 16px;
-  z-index: 101;
-  border-radius: 5px;
+  z-index: 11 !important;
+  border-radius: 10px;
   display: none;
   box-shadow: 0 0 8px #fff;
   padding: 0px 5px !important;
 }
 
+.jimu-widget-slope #float {
+  position: relative !important;
+  top: 50px !important;
+  left: -60px !important;
+}
\ No newline at end of file

--
Gitblit v1.9.3