From 75770a9a5e82f61fce759f91b2792bb852668d7b Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 22 Jun 2021 14:19:45 +0800
Subject: [PATCH] 工具关闭调整
---
widgets/Tool/Widget.js | 114 +++++--------------------------------
widgets/spatialAnalysis/Widget.js | 16 ++---
2 files changed, 22 insertions(+), 108 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index 72020cb..d29725d 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -51,8 +51,8 @@
$('.jimu-widget-Sign').hide();
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
-
-
+
+
that.closefenxi();
@@ -82,8 +82,8 @@
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
-
-
+
+
that.closefenxi();
@@ -109,8 +109,8 @@
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
-
-
+
+
that.closefenxi();
@@ -136,8 +136,8 @@
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
$('.jimu-widget-MapPrinting').hide();
-
-
+
+
that.closefenxi();
@@ -165,8 +165,8 @@
topic.publish('closeSign', 'Sign');
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-MapPrinting').hide();
-
-
+
+
that.closefenxi();
@@ -197,8 +197,8 @@
topic.publish('closeFlyRoute', 'FlyRoute');
$('.jimu-widget-CoorPosition').hide();
-
-
+
+
that.closefenxi();
@@ -238,80 +238,6 @@
$(".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);
- // })
-
},
closeToolBox: function (item) {
@@ -320,19 +246,11 @@
}
},
closefenxi: function () {
- // 关闭可视
- topic.publish('closev', '');
- // 关闭剖面
- topic.publish('closep', '');
- // 关闭坡度
- topic.publish('closes', '');
- $(".jimu-widget-profileAnalysis").hide();
- $(".jimu-widget-slope").hide();
- $(".jimu-widget-visibleArea").hide();
+ // 关闭空间分析页面
$(".jimu-widget-spatialAnalysis").hide();
- //清除实体
- this.map.entities.removeAll();
- $(".jimu-widget-modelDiagram").hide();
+ // 关闭空间分析子元素
+ topic.publish('closeOnceUse');
+
},
onOpen: function () {
diff --git a/widgets/spatialAnalysis/Widget.js b/widgets/spatialAnalysis/Widget.js
index 5604cbd..af8ef2b 100644
--- a/widgets/spatialAnalysis/Widget.js
+++ b/widgets/spatialAnalysis/Widget.js
@@ -31,6 +31,8 @@
var that = this;
// 暴露在外的接口
+ topic.subscribe("closeOnceUse", lang.hitch(this, this.closeOnceUse));
+
function createTooltip(frameDiv) {//抄录createTooltip函数
var tooltip = function (frameDiv) {
@@ -149,6 +151,10 @@
name: '地形开挖',
classs: 'digTheEarth-tool',
img: './images/addL/pdpx.png'
+ }, {//方量分析//做好
+ name: '方量分析',
+ classs: 'volumeAnalysis-tool',
+ img: './images/addL/pdpx.png'
}
,
{//建造模型
@@ -160,15 +166,6 @@
{//清除模型
name: '清除模型',
classs: 'modesssss2222',
- img: './images/addL/pdpx.png'
- }
- , {//地形开挖，//做好
- name: '地形开挖',
- classs: 'digTheEarth-tool',
- img: './images/addL/pdpx.png'
- }, {//方量分析//做好
- name: '方量分析',
- classs: 'volumeAnalysis-tool',
img: './images/addL/pdpx.png'
}
];
@@ -309,7 +306,6 @@
if ($(".jimu-widget-digTheEarth").is(":visible")) {//判断是否隐藏
$(".jimu-widget-digTheEarth").hide();
topic.publish('closesDigTheEarth');
- console.log('dakai ')
}
//关闭方量贩分析
--
Gitblit v1.9.3