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/FlyRoute/Widget.js | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/widgets/FlyRoute/Widget.js b/widgets/FlyRoute/Widget.js
index 8ad607f..f5801c1 100644
--- a/widgets/FlyRoute/Widget.js
+++ b/widgets/FlyRoute/Widget.js
@@ -14,10 +14,12 @@
topic.subscribe("closeFlyRoute", lang.hitch(this, this.closeFlyRoute));
var self = this;
// this.inherited(arguments);
-
+
$('.close-flyrouter').click(function () {
- self.closeFlyRoute('FlyRoute')
+ self.closeFlyRoute('FlyRoute');
+ $('.jimu-widget-visualAngle').find('.v-a-Two').removeClass('on');//清楚样式
+ topic.publish('closeFly', 'closeFly');
});
},
@@ -36,13 +38,17 @@
if (data.length == undefined) return;
// let datas = data.data;
self.allRoutes = data;
+
+ $("#flightRoute").empty();
+ $('#passPoint').empty();
+
// if (data.code == 200) {
for (var i = 0; i < data.length; i++) {
$("#flightRoute").append('<option value = ' + data[i].name + ' > ' + data[i].name + ' </option>');
}
// }
-
+
self._loadRoute(self.allRoutes[0].sites);
$("#flightRoute").on("change", function (e) {
@@ -101,7 +107,6 @@
dataArr.push(data);
liDom.on('click', data, function (event) {
- console.log(event.data);
});
$('#passPoint').append(liDom);
@@ -150,8 +155,8 @@
this.flag = false;
$('.jimu-widget-FlyRoute').hide();
$('.jimu-widget-visualAngle .v-a-One').addClass('on').siblings().removeClass('on');
+ self.flightTool.flyManager.stop();
self.flightTool.RouteCollection.removeAllSites();
- $("#passPoint").empty();
}
},
@@ -166,7 +171,6 @@
var geodesic = new Cesium.EllipsoidGeodesic();
geodesic.setEndPoints(point1cartographic, point2cartographic);
var s = geodesic.surfaceDistance;
- //console.log(Math.sqrt(Math.pow(distance, 2) + Math.pow(endheight, 2)));
//返回两点之间的距离
s = Math.sqrt(Math.pow(s, 2) + Math.pow(point2cartographic.height - point1cartographic.height, 2));
distance = distance + s;
@@ -205,7 +209,6 @@
},
_loadRoute: function _loadRoute(route) {
- console.log(route);
var self = this;
$("#passPoint").empty();
self.flightTool.RouteCollection.AddRoute(route);
@@ -213,7 +216,6 @@
var liStr = "<li class='item'>途径点" + (j + 1) + "</li>";
var liDom = $(liStr);
liDom.on('click', route[j], function (event) {
- console.log(event.data);
var site = self.flightTool.RouteCollection.getSiteByIndex(event.data.id);
self.flightTool.flyManager.viewToSite(site);
});
@@ -237,7 +239,7 @@
this.resize();
},
- resize: function resize() {},
+ resize: function resize() { },
destroy: function destroy() {
//销毁的时候触发
--
Gitblit v1.9.3