From 4d8ef5d02421b1bb60f575e56b75d43a1ea4c2bb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 15 Jun 2021 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/Tool/Widget.js | 139 ++++++++++++++++++++++++++++++----------------
1 files changed, 90 insertions(+), 49 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index dfb0dfd..7c22602 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -28,6 +28,7 @@
name: 'Tool',
layers: {},
startup: function () {
+ var that = this;
// 暴露在外的接口
topic.subscribe("closeTool", lang.hitch(this, this.closeToolBox));
this.inherited(arguments);
@@ -39,79 +40,119 @@
// 图上量算
$('.measure-tool').click(function () {
- $('.jimu-widget-Location').hide();
- $('.jimu-widget-Measurement').show();
+ that.map.scene.globe.depthTestAgainstTerrain = false;
+ // 关闭卷帘
+ topic.publish('closeRolling', 'Rolling');
+ // 关闭分屏
+ topic.publish('closeSplitScreen', 'SplitScreen');
+ // 关闭标记
+ topic.publish('closeSign', 'Sign');
+ topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-Sign').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-SplitScreen').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.tool-y-box').toggle()
+ $('.jimu-widget-CoorPosition').hide();
+ $('.jimu-widget-MapPrinting').hide();
+
+ $('.jimu-widget-Measurement').show();
+
+ $('.tool-y-box').stop().hide();
+
})
-
-
// 卷帘对比
$('.rolling-tool').click(function () {
+
+ // 关闭量算
+ topic.publish('closeMeasurement', 'Measurement');
+ // 关闭分屏
+ topic.publish('closeSplitScreen', 'SplitScreen');
+ // 关闭标记
+ topic.publish('closeSign', 'Sign');
+ topic.publish('closeFlyRoute', 'FlyRoute');
+ $('.jimu-widget-CoorPosition').hide();
+ $('.jimu-widget-MapPrinting').hide();
+
topic.publish('openRolling', 'Rolling');
- $('.jimu-widget-Location').hide();
- $('.jimu-widget-Rolling').show();
- $('#widgets_Rolling_Widget_17').show();
- $('.jimu-widget-Measurement').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-SplitScreen').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.tool-y-box').toggle();
+
+ $('.tool-y-box').stop().hide();
+
+ })
+
+ // 分屏对比
+ $('.splitScreen-tool').click(function () {
+ // 关闭量算
+ topic.publish('closeMeasurement', 'Measurement');
+ // 关闭卷帘
+ topic.publish('closeRolling', 'Rolling');
+ // 关闭标记
+ topic.publish('closeSign', 'Sign');
+ topic.publish('closeFlyRoute', 'FlyRoute');
+ $('.jimu-widget-CoorPosition').hide();
+ $('.jimu-widget-MapPrinting').hide();
+
+ topic.publish('openSplitScreen', 'SplitScreen');
+
+ $('.tool-y-box').stop().hide();
})
// 我的标记
$('.sign-tool').click(function () {
+
+ // 关闭量算
+ topic.publish('closeMeasurement', 'Measurement');
+ // 关闭卷帘
+ topic.publish('closeRolling', 'Rolling');
+ // 关闭分屏
+ topic.publish('closeSplitScreen', 'SplitScreen');
+ topic.publish('closeFlyRoute', 'FlyRoute');
+ $('.jimu-widget-CoorPosition').hide();
+ $('.jimu-widget-MapPrinting').hide();
+
topic.publish('openSign', 'Sign');
- $('.jimu-widget-Location').hide();
- $('.jimu-widget-Sign').show();
- $('.jimu-widget-Measurement').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-SplitScreen').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.tool-y-box').toggle()
+
+ $('.tool-y-box').stop().hide();
+
})
// 坐标定位
$('.CoorPosition-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-MapPrinting').hide();
$('.jimu-widget-CoorPosition').show();
- $('.jimu-widget-Location').hide();
- $('.jimu-widget-Measurement').hide();
- $('.jimu-widget-Sign').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-SplitScreen').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.tool-y-box').toggle()
+
+ $('.tool-y-box').stop().hide();
+
})
// 地图打印
$('.MapPrinting-tool').click(function () {
- $('.jimu-widget-Location').hide();
- $('.jimu-widget-MapPrinting').show();
+
+ // 关闭量算
+ 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-Measurement').hide();
- $('.jimu-widget-Sign').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.jimu-widget-SplitScreen').hide();
- $('.tool-y-box').toggle()
+ $('.jimu-widget-MapPrinting').show();
+
+ $('.tool-y-box').stop().hide();
+
})
- // 分屏对比
- $('.splitScreen-tool').click(function () {
- $('.jimu-widget-SplitScreen').show();
- $('.jimu-widget-CoorPosition').hide();
- $('.jimu-widget-Location').hide();
- $('.jimu-widget-Measurement').hide();
- $('.jimu-widget-Sign').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.tool-y-box').toggle()
- })
+
},
--
Gitblit v1.9.3