From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/Tool/Widget.js | 142 ++++++++++++++++++++++++++--------------------
1 files changed, 80 insertions(+), 62 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 4289d78..6277fa6 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -35,6 +35,12 @@
$('.tool-bar .tool-btn span').click(function () {
topic.publish('closeMap', this.name);
topic.publish('closeZtree', this.name);
+ topic.publish('closeNavigation', this.name);
+ $(".jimu-widget-Layermanagement .layer-list").stop().hide();
+
+ if ($(".jimu-widget-Layermanagement .layer-list").is(":hidden")) {
+ $(".jimu-widget-Layermanagement .tree-layer-opcity").stop().hide();
+ }
$('.tool-y-box').toggle();
})
@@ -51,10 +57,18 @@
$('.jimu-widget-Sign').hide();
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
- $(".jimu-widget-visibleArea").hide();
- $(".jimu-widget-profileAnalysis").hide();
- $(".jimu-widget-slope").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();
@@ -64,6 +78,7 @@
// 卷帘对比
$('.rolling-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭分屏
@@ -71,12 +86,18 @@
// 关闭标记
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
+
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
- $(".jimu-widget-visibleArea").hide();
- $(".jimu-widget-profileAnalysis").hide();
- $(".jimu-widget-slope").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');
@@ -85,6 +106,7 @@
// 分屏对比
$('.splitScreen-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -94,10 +116,15 @@
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
- $(".jimu-widget-visibleArea").hide();
- $(".jimu-widget-profileAnalysis").hide();
- $(".jimu-widget-slope").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');
@@ -106,6 +133,7 @@
// 我的标记
$('.sign-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -115,10 +143,15 @@
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
- $(".jimu-widget-visibleArea").hide();
- $(".jimu-widget-profileAnalysis").hide();
- $(".jimu-widget-slope").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');
@@ -128,6 +161,7 @@
// 坐标定位
$('.CoorPosition-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -138,10 +172,15 @@
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-MapPrinting').hide();
- $(".jimu-widget-visibleArea").hide();
- $(".jimu-widget-profileAnalysis").hide();
- $(".jimu-widget-slope").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();
@@ -152,6 +191,7 @@
// 地图打印
$('.MapPrinting-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -160,21 +200,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();
- $(".jimu-widget-slope").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();
})
-
- // 可视分析
- $('.visibleArea-tool').click(function () {
-
+ // 空间分析
+ $('.spatialAnalysis-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = true;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -186,52 +232,17 @@
topic.publish('closeFlyRoute', 'FlyRoute');
$('.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();
- })
- $('.profileAnalysis-tool').click(function () {
+ that.closefenxi();
- // 关闭量算
- 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-slope").hide();
- $('.tool-y-box').stop().hide();
-
- $(".jimu-widget-profileAnalysis").show();
- })
- $('.slope-tool').click(function () {
+ //关闭飞行
+ $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
- // 关闭量算
- 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);
+ $(".jimu-widget-spatialAnalysis").show();
})
},
@@ -241,7 +252,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