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

zhanmingkan

2022-05-17 ad3562d25c2bcb4044ba631bd91d20703ab3bfe7

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

 assets/map/map3D.js

@@ -934,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",
@@ -945,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",
@@ -1492,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({