From a096c8b853e250a4215bd30cffac2a548a5d7cb9 Mon Sep 17 00:00:00 2001
From: ansel0926 <ansel0926@gmail.com>
Date: 星期六, 14 五月 2022 16:59:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB
---
assets/map/map3D.js | 131 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 120 insertions(+), 11 deletions(-)
diff --git a/assets/map/map3D.js b/assets/map/map3D.js
index fa6c49b..78455c7 100644
--- a/assets/map/map3D.js
+++ b/assets/map/map3D.js
@@ -148,6 +148,7 @@
viewer.clock.onTick.removeEventListener(onTickCallback);
var pick = viewer.scene.pick(movement.position);
CesiumPop.removeDiv();
+
if(labelLayer!=null){//鍏抽棴鏂囧瓧缂栬緫寮圭獥
layer.close(labelLayer);
}
@@ -210,7 +211,6 @@
layer.config({
extend: 'myskin/style.css' //鍚屾牱闇�瑕佸厛鍔犺浇鏂扮毊鑲�
});
-
labelLayer=layer.open({
type: 2,
title: '<i class="iconfont icon-huitu i-item" style="font-size: 18px; color: white;"></i> ' + "缂栬緫鏂囧瓧",
@@ -227,6 +227,30 @@
success: function (layero, index) {
var iframe = window['layui-layer-iframe' + index];//鎷垮埌iframe鍏冪礌
iframe.child(entity._id,pickPrimitive._text,pickPrimitive._fillColor.toCssHexString(),pickPrimitive._fontSize,pickPrimitive._fontFamily);//鍚戞iframe灞傛柟娉� 浼犻�掑弬鏁�
+ }
+ });
+ }
+ else if(entity._name=='drawPointEntity'){
+ document.getElementById("pop_" +entity.id).style.display="block";
+ layer.config({
+ extend: 'myskin/style.css' //鍚屾牱闇�瑕佸厛鍔犺浇鏂扮毊鑲�
+ });
+ labelLayer=layer.open({
+ type: 2,
+ title: '<i class="iconfont icon-huitu i-item" style="font-size: 18px; color: white;"></i> ' + "缂栬緫鐐�",
+ maxmin: true,
+ skin: 'layer-ext-myskin',
+ shade: 0,
+ maxmin: false,
+ scrollbar: false,
+ shadeClose: true, //鐐瑰嚮閬僵鍏抽棴灞�
+ area: ['320px', '300px'],
+ resize: false,
+ offset: ['50px',document.body.clientWidth-340],
+ content: 'project/editPoint.html',
+ success: function (layero, index) {
+ var iframe = window['layui-layer-iframe' + index];//鎷垮埌iframe鍏冪礌
+ iframe.child(entity._id,entity.title);//鍚戞iframe灞傛柟娉� 浼犻�掑弬鏁�
}
});
}
@@ -803,6 +827,57 @@
});
}
+function updatePoint(type,id,val){//淇敼鐐癸細zzf
+ let signPointEntity = viewer.entities.getById(id);
+ let popId="pop_"+id;
+ let saveData;
+ if(type==1){
+ signPointEntity.title=val;
+ let treeLabelNode=getNodeById(signPointEntity.id,layerMenu[3].children)
+ treeLabelNode.title=val;
+ $("#" + popId).children(".bx-popup-header-ctn")[0].innerText=val;
+ saveData= {
+ "id":signPointEntity._id,
+ "type": "point",
+ "longitude": signPointEntity._position._value.x,
+ "latitude": signPointEntity._position._value.y,
+ "height": signPointEntity._position._value.z,
+ "content":signPointEntity.title,
+ }
+ }
+ else if(type==2){
+ let urlArr = val.split("/");
+ let newUrl=urlArr.splice(3).join("/")
+ $("#" + popId).children(".bx-popup-content-ctn").children(".bx-popup-content").children(".image")[0].src = val;
+ saveData= {
+ "id":signPointEntity._id,
+ "type": "point",
+ "longitude": signPointEntity._position._value.x,
+ "latitude": signPointEntity._position._value.y,
+ "height": signPointEntity._position._value.z,
+ "imagePath":newUrl,
+ }
+ }
+
+ let token = window.localStorage.getItem("token");
+ $.ajax({
+ type: "post",
+ async: false,
+ url: parent.httpConfig.webApiUrl + "landstamp/front/updateDrawEntity",
+ data: saveData,
+ contentType: "application/x-www-form-urlencoded",
+ beforeSend:function(request){
+ request.setRequestHeader("token",token);
+ },
+ success: function (data) {
+ console.log(data)
+ },
+ error: function (XMLHttpRequest, textStatus, errorThrown) {
+ console.log("ajax璇锋眰澶辫触锛�");
+ }
+ });
+}
+
function addSeaFlow() {
var waterFace = [121.52380572667727, 40.857604886322704, -30.580650037676627 + 400.0,
121.29444660541178, 40.90418429460569, -54.60203546856298 + 400.0,
@@ -1134,6 +1209,7 @@
}
function initDrawEntity(){//zzf:鍒濆鍖栧浘褰�
+
let token = window.localStorage.getItem("token");
$.ajax({
type: "get",
@@ -1168,21 +1244,54 @@
}
function drawAjaxPoint(drawEntity){//鍔犺浇鐐�
+ //
+ let cartesian3 = Cesium.Cartesian3.fromDegrees(drawEntity.longitude, drawEntity.latitude, drawEntity.height);
+ console.log(drawEntity.content,cartesian3.x,cartesian3.y,cartesian3.z)
let cartesian=new Cesium.Cartesian3(parseFloat(drawEntity.longitude),parseFloat(drawEntity.latitude),parseFloat(drawEntity.height))
var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
- var entity = viewer.entities.add({
+ var entity=viewer.entities.add({
id:drawEntity.id,
- name: 'drawPointEntity',
- position: cartesian,
- point: {
- color: Cesium.Color.RED,
- pixelSize: 10,
- outlineColor: Cesium.Color.WHITE,
- outlineWidth: 2,
- disableDepthTestDistance: Number.POSITIVE_INFINITY
+ name:"drawPointEntity",
+ position:cartesian,
+ label: {
+ show: true,
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+ font: 'bold 14px Helvetica',
+ fillColor: Cesium.Color.WHITE,
+ text: "",
+ disableDepthTestDistance: Number.POSITIVE_INFINITY,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
+ },
+ billboard: {
+ image: "../assets/images/icon/icon1.png",
+ width: 40,
+ height: 40,
+ rotation: 0,
+ verticalOrigin: Cesium.VerticalOrigin.TOP,
+ horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+ disableDepthTestDistance: Number.POSITIVE_INFINITY,//骞垮憡鐗屼笉杩涜娣卞害妫�娴�
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
}
});
- entity.title = "鐐�" + new Date(drawEntity.createTime).format("yyyyMMddhhmmss");
+ if(drawEntity.content!=null&&drawEntity.content!=""){
+ entity.title=drawEntity.content;
+ }
+ else{
+ entity.title = "鐐�" + new Date(drawEntity.createTime).format("yyyyMMddhhmmss");
+ }
+ let popup = new Popup({
+ viewer:viewer,
+ geometry:cartesian,
+ entity:entity,
+ id: "pop_" + entity.id
+ })
+ if( drawEntity.imagePath!=null&& drawEntity.imagePath!=""){
+ $("#pop_" + entity.id).children(".bx-popup-content-ctn").children(".bx-popup-content").children(".image")[0].src = parent.httpConfig.webApiUrl+drawEntity.imagePath;
+ }
+ document.getElementById("pop_" +entity.id).style.display="none";
addTreeNode({
"title": entity.title,
"id": entity.id,
--
Gitblit v1.9.1