From d12e030d8a7690d79c5786bc2a786b6c21a24433 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Jun 2021 16:31:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/Tool/Widget.js | 173 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 144 insertions(+), 29 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index ab3f608..d4b6ef3 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -51,18 +51,27 @@
$('.jimu-widget-Sign').hide();
$('.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-spatialAnalysis").hide();
$('.jimu-widget-Measurement').show();
- $('.tool-y-box').stop().hide();
})
// 卷帘对比
$('.rolling-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭分屏
@@ -72,17 +81,26 @@
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-spatialAnalysis").hide();
topic.publish('openRolling', 'Rolling');
- $('.tool-y-box').stop().hide();
})
// 分屏对比
$('.splitScreen-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -92,17 +110,26 @@
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-spatialAnalysis").hide();
topic.publish('openSplitScreen', 'SplitScreen');
- $('.tool-y-box').stop().hide();
})
// 我的标记
$('.sign-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -112,18 +139,27 @@
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-spatialAnalysis").hide();
topic.publish('openSign', 'Sign');
- $('.tool-y-box').stop().hide();
})
// 坐标定位
$('.CoorPosition-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -134,12 +170,20 @@
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
$('.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-spatialAnalysis").hide();
$('.jimu-widget-CoorPosition').show();
- $('.tool-y-box').stop().hide();
})
@@ -147,6 +191,7 @@
// 地图打印
$('.MapPrinting-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -157,18 +202,25 @@
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').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-spatialAnalysis").hide();
$('.jimu-widget-MapPrinting').show();
- $('.tool-y-box').stop().hide();
})
-
- // 可视分析
- $('.visibleArea-tool').click(function () {
-
+ // 空间分析
+ $('.spatialAnalysis-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = true;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -180,31 +232,94 @@
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-visibleArea").show();
+ $(".jimu-widget-slope").hide();
$('.tool-y-box').stop().hide();
- })
-
- $('.profileAnalysis-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").show();
- $('.tool-y-box').stop().hide();
+ $(".jimu-widget-spatialAnalysis").show();
})
+ // // 可视分析
+ // $('.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', '');
+ // $(".jimu-widget-profileAnalysis").hide();
+ // $(".jimu-widget-slope").hide();
+ // $('.tool-y-box').stop().hide();
+
+ // $(".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', '');
+ // $(".jimu-widget-visibleArea").hide();
+ // $(".jimu-widget-slope").hide();
+ // $('.tool-y-box').stop().hide();
+
+ // $(".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', '');
+ // $(".jimu-widget-visibleArea").hide();
+ // $(".jimu-widget-profileAnalysis").hide();
+ // $('.tool-y-box').stop().hide();
+
+ // $(".jimu-widget-slope").show();
+ // topic.publish('getbeginSlope', this.beginSlope);
+ // })
+
},
closeToolBox: function (item) {
--
Gitblit v1.9.3