Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB

ansel0926

2022-05-17 885edef97a642aaceede847c084f70156cbfe9a9

 assets/map/map3D.js

@@ -9,6 +9,8 @@
var userId;
var userName;

var layerMap=new Map();//存储id和图层的index索引结构

var entityMouseClickListenerIsEnable = true;

var previousTime;//地球旋转的参数
@@ -224,9 +226,9 @@
                     maxmin: false,
                     scrollbar: false,
                     shadeClose: true, 
                     area: ['310px', '480px'],
                     area: ['320px', '480px'],
                     resize: false,
                     offset: ['50px',document.body.clientWidth-320],
                     offset: ['50px',document.body.clientWidth-330],
                     content: 'project/editLabel.html',
                     success: function (layero, index) {
                        var iframe = window['layui-layer-iframe' + index];
@@ -254,9 +256,9 @@
                     maxmin: false,
                     scrollbar: false,
                     shadeClose: true,
                     area: ['300px', '330px'],
                     area: ['320px', '335px'],
                     resize: false,
                     offset: ['50px',document.body.clientWidth-320],
                     offset: ['50px',document.body.clientWidth-330],
                     content: 'project/editPoint.html',
                     success: function (layero, index) {
                        var iframe = window['layui-layer-iframe' + index];
@@ -282,9 +284,9 @@
                     maxmin: false,
                     scrollbar: false,
                     shadeClose: true,
                     area: ['310px', '300px'],
                     area: ['320px', '300px'],
                     resize: false,
                     offset: ['50px',document.body.clientWidth-320],
                     offset: ['50px',document.body.clientWidth-330],
                     content: 'project/editLine.html',
                     success: function (layero, index) {
                        var iframe = window['layui-layer-iframe' + index];
@@ -309,9 +311,9 @@
                     maxmin: false,
                     scrollbar: false,
                     shadeClose: true,
                     area: ['310px', '300px'],
                     area: ['320px', '300px'],
                     resize: false,
                     offset: ['50px',document.body.clientWidth-320],
                     offset: ['50px',document.body.clientWidth-330],
                     content: 'project/editPolygon.html',
                     success: function (layero, index) {
                        var iframe = window['layui-layer-iframe' + index];
@@ -932,7 +934,7 @@
   else if(type==5){
      let urlArr = val.split("/");
      let newUrl=urlArr.splice(4).join("/")
      $("#" + popId).children(".bx-popup-content-ctn").children(".bx-popup-content").children(".image")[0].src = val;
      $("#" + popId).children(".bx-popup-content-ctn").children(".bx-popup-content").children(".image")[0].src = parent.httpConfig.nginxUrl+newUrl;
      saveData= {
         "id":signPointEntity._id,
         "type": "point",
@@ -943,7 +945,7 @@
   else if(type==6){
      let urlArr = val.split("/");
      let newUrl=urlArr.splice(4).join("/")
      signPointEntity._billboard._image._value=parent.httpConfig.nginxUrl+newUrl;;
      signPointEntity._billboard._image._value=parent.httpConfig.nginxUrl+newUrl;
      saveData= {
         "id":signPointEntity._id,
         "type": "point",
@@ -1490,7 +1492,7 @@
      content:drawEntity.popContent?drawEntity.popContent:null,
   })
   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;
      $("#pop_" + entity.id).children(".bx-popup-content-ctn").children(".bx-popup-content").children(".image")[0].src = parent.httpConfig.nginxUrl+drawEntity.imagePath;
   }
   document.getElementById("pop_" +entity.id).style.display="none";
   addTreeNode({