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 | 198 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 182 insertions(+), 16 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 7c22602..d4b6ef3 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -3,16 +3,16 @@
// 模块描述:显示坐标
///////////////////////////////////////////////////////////////////////////
define([
- 'dojo/_base/declare',
- 'dojo/_base/lang',
- 'dojo/_base/array',
- 'dojo/_base/html',
- 'dojo/topic',
- 'jimu/BaseWidget',
- 'jimu/utils',
- 'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
- 'libs/zTree_v3/js/jquery.ztree.all'
- ],
+ 'dojo/_base/declare',
+ 'dojo/_base/lang',
+ 'dojo/_base/array',
+ 'dojo/_base/html',
+ 'dojo/topic',
+ 'jimu/BaseWidget',
+ 'jimu/utils',
+ 'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
+ 'libs/zTree_v3/js/jquery.ztree.all'
+],
function (declare,
lang,
array,
@@ -51,16 +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');
// 关闭分屏
@@ -70,15 +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');
// 关闭卷帘
@@ -88,15 +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');
// 关闭卷帘
@@ -106,16 +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');
// 关闭卷帘
@@ -126,9 +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();
})
@@ -136,6 +191,7 @@
// 地图打印
$('.MapPrinting-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -146,13 +202,123 @@
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();
})
+ // 空间分析
+ $('.spatialAnalysis-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();
+ $(".jimu-widget-visibleArea").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);
+ // })
},
--
Gitblit v1.9.3