From 2d122da4dd0533125793a07deeb9d940dd786bfe Mon Sep 17 00:00:00 2001
From: ansel0926 <ansel0926@gmail.com>
Date: 星期日, 15 五月 2022 18:42:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB
---
assets/utils/popup.js | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/assets/utils/popup.js b/assets/utils/popup.js
index b6515a1..4ddc047 100644
--- a/assets/utils/popup.js
+++ b/assets/utils/popup.js
@@ -27,7 +27,7 @@
content:'<img class="image" style="width:100%;height:100%;max-width:200px;max-height:150px" src=""></img>'
}
}
- else if(_this.type=="text"){
+ else if(_this.type=="label"){
testConfig= {
header:_this.entity.title,
//header:"",
@@ -46,8 +46,23 @@
var _this = this;
var position = Cesium.SceneTransforms.wgs84ToWindowCoordinates(_this.viewer.scene,geometry)
if(position!=null){
- _this.ctn.css("left",position.x- _this.ctn.get(0).offsetWidth/2);
- _this.ctn.css("top",position.y- _this.ctn.get(0).offsetHeight - 10);
+ let w=window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+ let h=window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+ let x=position.x- _this.ctn.get(0).offsetWidth/2
+ let y=position.y- _this.ctn.get(0).offsetHeight - 10;
+ if(x<0){
+ x=330;
+ }else if(x>w){
+ x=w;
+ }
+ if(y<0){
+ y=0
+ }
+ else if(y>h){
+ y=h;
+ }
+ _this.ctn.css("left",x);
+ _this.ctn.css("top",y);
}
}
// 鍔ㄦ�佺敓鎴愬唴瀹�
@@ -61,8 +76,8 @@
'</div>'+
'</div>'+
'<div class="bx-popup-tip-container" >'+
- '<div class="bx-popup-tip" >'+
- '</div>'+
+ // '<div class="bx-popup-tip" >'+
+ // '</div>'+
'</div>'+
'<a class="leaflet-popup-close-button" onClick="Popup.prototype.close(\''+id+'\')">X</a>';
return html;
--
Gitblit v1.9.1