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 | 136 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 117 insertions(+), 19 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 7c22602..6277fa6 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,
@@ -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();
})
@@ -52,15 +58,27 @@
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
- $('.jimu-widget-Measurement').show();
+
+ that.closefenxi();
+
$('.tool-y-box').stop().hide();
+ //关闭飞行
+ $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
+
+
+
+
+ $('.jimu-widget-Measurement').show();
+
})
// 卷帘对比
$('.rolling-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭分屏
@@ -68,17 +86,27 @@
// 关闭标记
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
+
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
- topic.publish('openRolling', 'Rolling');
+
+ that.closefenxi();
+
$('.tool-y-box').stop().hide();
+ //关闭飞行
+ $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
+
+ topic.publish('openRolling', 'Rolling');
+
})
// 分屏对比
$('.splitScreen-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -89,14 +117,23 @@
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
- topic.publish('openSplitScreen', 'SplitScreen');
+
+ that.closefenxi();
+
$('.tool-y-box').stop().hide();
+ //关闭飞行
+ $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
+
+ topic.publish('openSplitScreen', 'SplitScreen');
+
})
// 我的标记
$('.sign-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -107,15 +144,24 @@
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
- topic.publish('openSign', 'Sign');
+
+ that.closefenxi();
+
$('.tool-y-box').stop().hide();
+ //关闭飞行
+ $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
+
+ topic.publish('openSign', 'Sign');
+
})
// 坐标定位
$('.CoorPosition-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -126,9 +172,18 @@
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-MapPrinting').hide();
- $('.jimu-widget-CoorPosition').show();
+
+
+ that.closefenxi();
+
$('.tool-y-box').stop().hide();
+ //关闭飞行
+ $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
+
+ $('.jimu-widget-CoorPosition').show();
+
})
@@ -136,6 +191,36 @@
// 地图打印
$('.MapPrinting-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
+ // 关闭量算
+ topic.publish('closeMeasurement', 'Measurement');
+ // 关闭卷帘
+ topic.publish('closeRolling', 'Rolling');
+ // 关闭分屏
+ topic.publish('closeSplitScreen', 'SplitScreen');
+ // 关闭标记
+ topic.publish('closeSign', 'Sign');
+
+ topic.publish('closeFlyRoute', 'FlyRoute');
+
+ $('.jimu-widget-CoorPosition').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();
+
+
+ })
+ // 空间分析
+ $('.spatialAnalysis-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = true;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -146,13 +231,19 @@
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
- $('.jimu-widget-MapPrinting').show();
-
+ $('.jimu-widget-MapPrinting').hide();
$('.tool-y-box').stop().hide();
+
+ that.closefenxi();
+
+
+ //关闭飞行
+ $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
+
+ $(".jimu-widget-spatialAnalysis").show();
})
-
-
},
@@ -161,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