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/visibleArea/Widget.js |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/widgets/visibleArea/Widget.js b/widgets/visibleArea/Widget.js
index ffd7789..2e244d6 100644
--- a/widgets/visibleArea/Widget.js
+++ b/widgets/visibleArea/Widget.js
@@ -45,6 +45,10 @@
                     color: new Cesium.Color(1.0, 1.0, 1.0, 1),
                     intensity: 0.55
                 };
+                // var URL_CONFIG = {
+                //     SCENE_CBD: 'http://www.supermapol.com/realspace/services/3D-CBDCache20200416/rest/realspace',
+                // }
+                // var promise = scene.open(URL_CONFIG.SCENE_CBD);
                 directionalLight_1 = new Cesium.DirectionalLight(position1, dirLightOptions);//加载光源
                 scene.addLightSource(directionalLight_1);
                 var viewPosition;
@@ -56,6 +60,7 @@
                 // 先将此标记置为true,不激活鼠标移动事件中对可视域分析对象的操作
                 scene.viewFlag = true;
                 var pointHandler = new Cesium.DrawHandler(viewer, Cesium.DrawMode.Point);
+
                 // 创建可视域分析对象
                 var viewshed3D = new Cesium.ViewShed3D(scene);
                 var colorStr1 = viewshed3D.visibleAreaColor.toCssColorString();
@@ -256,6 +261,7 @@
                             viewshed3D.setDistDirByPoint([longitude, latitude, height]);
                         }
                     }
+                    // handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
                 }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
 
                 handler.setInputAction(function (e) {
@@ -271,7 +277,7 @@
                         viewModel.horizontalFov = viewshed3D.horizontalFov;
                         viewModel.verticalFov = viewshed3D.verticalFov;
                     } else {
-                        console.log('没打开');
+                        // console.log('没打开');
                     }
 
                 }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
@@ -313,6 +319,7 @@
                     viewer.entities.removeAll();
                     viewshed3D.distance = 0.1;
                     scene.viewFlag = true;
+                    pointHandler.clear();
                 })
 
                 $('.jimu-widget-visibleArea').find(".closes").click(function () {
@@ -321,23 +328,27 @@
                     viewer.entities.removeAll();
                     viewshed3D.distance = 0.1;
                     scene.viewFlag = true;
+                    pointHandler.clear();
                 })
                 // console.log(scene)
                 this.viewer = viewer;
                 this.viewshed3D = viewshed3D;
                 this.scene = scene;
+                this.pointHandler = pointHandler;
 
                 topic.subscribe("closev", lang.hitch(this, this.closev));
             },
             viewer: '',
             viewshed3D: '',
             scene: '',
+            pointHandler: '',
             closev: function () {
                 $(".jimu-widget-visibleArea").hide();
                 $("#wrapper").hide();
                 this.viewer.entities.removeAll();
                 this.viewshed3D.distance = 0.1;
                 this.scene.viewFlag = true;
+                this.pointHandler.clear();
             },
             onOpen: function () {
 

--
Gitblit v1.9.3