From e55ebf07a49b024fe7d2cebc0499bd949c7b55bb Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 17 Jun 2021 18:08:32 +0800
Subject: [PATCH] 工具切换关闭细节调整
---
widgets/slope/css/style.css | 4 +-
widgets/Tool/Widget.js | 55 ++++++++++++++++++++++++---
widgets/visibleArea/css/style.css | 4 +-
widgets/legends/css/style.css | 6 +-
widgets/profileAnalysis/css/style.css | 4 +-
widgets/profileAnalysis/Widget.js | 11 ++++-
widgets/searchL/css/style.css | 4 +-
widgets/visibleArea/Widget.js | 17 +++++++-
8 files changed, 83 insertions(+), 22 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 4289d78..590d014 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -51,6 +51,10 @@
$('.jimu-widget-Sign').hide();
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
+ // 关闭可视
+ topic.publish('closev', '');
+ // 关闭剖面
+ topic.publish('closep', '');
$(".jimu-widget-visibleArea").hide();
$(".jimu-widget-profileAnalysis").hide();
$(".jimu-widget-slope").hide();
@@ -64,6 +68,7 @@
// 卷帘对比
$('.rolling-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭分屏
@@ -73,6 +78,10 @@
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();
$(".jimu-widget-slope").hide();
@@ -85,6 +94,7 @@
// 分屏对比
$('.splitScreen-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -94,6 +104,10 @@
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();
$(".jimu-widget-slope").hide();
@@ -106,6 +120,7 @@
// 我的标记
$('.sign-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -115,6 +130,10 @@
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();
$(".jimu-widget-slope").hide();
@@ -128,6 +147,7 @@
// 坐标定位
$('.CoorPosition-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -138,6 +158,10 @@
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-MapPrinting').hide();
+ // 关闭可视
+ topic.publish('closev', '');
+ // 关闭剖面
+ topic.publish('closep', '');
$(".jimu-widget-visibleArea").hide();
$(".jimu-widget-profileAnalysis").hide();
$(".jimu-widget-slope").hide();
@@ -152,6 +176,7 @@
// 地图打印
$('.MapPrinting-tool').click(function () {
+ that.map.scene.globe.depthTestAgainstTerrain = false;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -162,6 +187,10 @@
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
+ // 关闭可视
+ topic.publish('closev', '');
+ // 关闭剖面
+ topic.publish('closep', '');
$(".jimu-widget-visibleArea").hide();
$(".jimu-widget-profileAnalysis").hide();
$(".jimu-widget-slope").hide();
@@ -174,7 +203,7 @@
// 可视分析
$('.visibleArea-tool').click(function () {
-
+ that.map.scene.globe.depthTestAgainstTerrain = true;
// 关闭量算
topic.publish('closeMeasurement', 'Measurement');
// 关闭卷帘
@@ -186,15 +215,19 @@
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');
// 关闭卷帘
@@ -206,15 +239,19 @@
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');
// 关闭卷帘
@@ -226,10 +263,14 @@
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);
})
diff --git a/widgets/legends/css/style.css b/widgets/legends/css/style.css
index ce128cb..f38a6e8 100644
--- a/widgets/legends/css/style.css
+++ b/widgets/legends/css/style.css
@@ -19,7 +19,7 @@
box-sizing: border-box;
padding: 0 6px 0 6px!important;
/* overflow: auto; */
- transition: all 2s;
+ transition: all 0.5s;
}
.jimu-widget-legends .title {
@@ -28,9 +28,9 @@
}
.jimu-widget-legends .main {
- max-height: 300px !important;
+ max-height: 280px !important;
overflow: auto;
- transition: all 2s;
+ transition: all 0.5s;
}
.jimu-widget-legends .main .m-init {
diff --git a/widgets/profileAnalysis/Widget.js b/widgets/profileAnalysis/Widget.js
index 602ea9f..378ff2d 100644
--- a/widgets/profileAnalysis/Widget.js
+++ b/widgets/profileAnalysis/Widget.js
@@ -339,9 +339,16 @@
$("#pro").width(0);
$("#pro").height(0);
})
-
+ this.handlerLine = handlerLine;
+ topic.subscribe("closep", lang.hitch(this, this.closep));
},
-
+ handlerLine: '',
+ closep: function () {
+ $(".jimu-widget-profileAnalysis").hide();
+ this.handlerLine.clear();
+ $("#pro").width(0);
+ $("#pro").height(0);
+ },
onOpen: function () {
},
diff --git a/widgets/profileAnalysis/css/style.css b/widgets/profileAnalysis/css/style.css
index 3ca7e1a..ed14706 100644
--- a/widgets/profileAnalysis/css/style.css
+++ b/widgets/profileAnalysis/css/style.css
@@ -1,7 +1,7 @@
.jimu-widget-profileAnalysis {
position: fixed !important;
- top: 96px !important;
- right: 10px !important;
+ top: 72px !important;
+ right: 60px !important;
width: 200px !important;
height: 40px !important;
background-color: rgb(255, 255, 255);
diff --git a/widgets/searchL/css/style.css b/widgets/searchL/css/style.css
index 5368c2a..3b48528 100644
--- a/widgets/searchL/css/style.css
+++ b/widgets/searchL/css/style.css
@@ -124,8 +124,8 @@
.jimu-widget-searchL .searchLMain {
display: none;
position: fixed;
- right: 5px;
- top: 70px;
+ right: 60px;
+ top: 72px;
width: 462px;
height: 520px;
border-radius: 5px 5px 5px 5px;
diff --git a/widgets/slope/css/style.css b/widgets/slope/css/style.css
index e0d05c8..72da04a 100644
--- a/widgets/slope/css/style.css
+++ b/widgets/slope/css/style.css
@@ -1,7 +1,7 @@
.jimu-widget-slope {
position: fixed !important;
- top: 96px !important;
- right: 10px !important;
+ top: 72px !important;
+ right: 60px !important;
width: 200px !important;
height: 40px !important;
background-color: rgb(255, 255, 255);
diff --git a/widgets/visibleArea/Widget.js b/widgets/visibleArea/Widget.js
index 39a1418..ffd7789 100644
--- a/widgets/visibleArea/Widget.js
+++ b/widgets/visibleArea/Widget.js
@@ -323,12 +323,25 @@
scene.viewFlag = true;
})
// console.log(scene)
- },
+ this.viewer = viewer;
+ this.viewshed3D = viewshed3D;
+ this.scene = scene;
+ topic.subscribe("closev", lang.hitch(this, this.closev));
+ },
+ viewer: '',
+ viewshed3D: '',
+ scene: '',
+ closev: function () {
+ $(".jimu-widget-visibleArea").hide();
+ $("#wrapper").hide();
+ this.viewer.entities.removeAll();
+ this.viewshed3D.distance = 0.1;
+ this.scene.viewFlag = true;
+ },
onOpen: function () {
},
-
onClose: function () {
//面板关闭的时候触发 （when this panel is closed trigger）
},
diff --git a/widgets/visibleArea/css/style.css b/widgets/visibleArea/css/style.css
index db350db..ce45ef4 100644
--- a/widgets/visibleArea/css/style.css
+++ b/widgets/visibleArea/css/style.css
@@ -1,7 +1,7 @@
.jimu-widget-visibleArea {
position: fixed !important;
- top: 96px !important;
- right: 10px !important;
+ top: 72px !important;
+ right: 60px !important;
width: 200px !important;
height: 40px !important;
background-color: rgb(255, 255, 255);
--
Gitblit v1.9.3