From 66f2854366a59a2194ac51e67e5c6ddc29b20ff3 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 19 Jun 2021 16:29:34 +0800
Subject: [PATCH] 解决冲突
---
widgets/Tool/Widget.js | 174 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 123 insertions(+), 51 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 590d014..54b7769 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -55,10 +55,19 @@
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-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
+
+
+
$('.jimu-widget-Measurement').show();
@@ -82,10 +91,16 @@
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-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
topic.publish('openRolling', 'Rolling');
@@ -108,10 +123,16 @@
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-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
topic.publish('openSplitScreen', 'SplitScreen');
@@ -134,10 +155,16 @@
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-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
topic.publish('openSign', 'Sign');
@@ -162,10 +189,16 @@
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-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
$('.jimu-widget-CoorPosition').show();
@@ -185,24 +218,32 @@
topic.publish('closeSplitScreen', 'SplitScreen');
// 关闭标记
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-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');
@@ -215,65 +256,96 @@
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
+ $('.tool-y-box').stop().hide();
// 关闭可视
- // topic.publish('closev', '');
+ 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-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
- $(".jimu-widget-visibleArea").show();
+ $(".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();
+ // $('.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();
- })
+ // $(".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();
+ // $('.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);
- })
+ // $(".jimu-widget-slope").show();
+ // topic.publish('getbeginSlope', this.beginSlope);
+ // })
},
--
Gitblit v1.9.3