上传图标

ansel0926

2022-05-15 41f6d1a2b56410495d0fcdd159ad288e6cb07c41

 assets/map/map3D.js

@@ -224,7 +224,7 @@
                     maxmin: false,
                     scrollbar: false,
                     shadeClose: true, 
                     area: ['310px', '450px'],
                     area: ['310px', '480px'],
                     resize: false,
                     offset: ['50px',document.body.clientWidth-320],
                     content: 'project/editLabel.html',
@@ -254,7 +254,7 @@
                     maxmin: false,
                     scrollbar: false,
                     shadeClose: true,
                     area: ['310px', '300px'],
                     area: ['300px', '330px'],
                     resize: false,
                     offset: ['50px',document.body.clientWidth-320],
                     content: 'project/editPoint.html',
@@ -837,6 +837,7 @@
function updateLabel(type,id,val){//修改文字：zzf
   let signPointEntity = viewer.entities.getById(id)
   let popId="pop_"+id;
   let saveData;
   if(type==1){//标签文字
      signPointEntity.title=val;
      signPointEntity._label._text._value = val;
@@ -861,8 +862,20 @@
   else if(type==5){//文本内容
      $("#pop_" +signPointEntity.id).children(".bx-popup-content-ctn").children(".bx-popup-content").children(".textarea")[0].innerHTML=val;
   }
   else if(type==6){
      let urlArr = val.split("/");
      let newUrl=urlArr.splice(4).join("/")
      signPointEntity._billboard._image._value=parent.httpConfig.nginxUrl+newUrl;
      saveData= {
         "id":signPointEntity._id,
         "type": "label",
         "content":signPointEntity.title,
         "iconPath":newUrl,
      }
   }
   let popContent=$("#pop_" +signPointEntity.id).children(".bx-popup-content-ctn").children(".bx-popup-content").children(".textarea")[0].innerHTML;
   let saveData= {
   if(type==1||type==2||type==3||type==4||type==5){
      saveData= {
      "id":signPointEntity._id,
      "type": "label",
      "content":signPointEntity.title,
@@ -870,6 +883,7 @@
      "fontsize":signPointEntity._label._font._value.split(" ")[0].replace("px",""),
      "fontstyle":signPointEntity._label._font._value.split(" ")[1],
      "popContent":popContent
      }
   }
   let token = window.localStorage.getItem("token");
   $.ajax({
@@ -917,13 +931,24 @@
   }
   else if(type==5){
      let urlArr = val.split("/");
      let newUrl=urlArr.splice(3).join("/")
      let newUrl=urlArr.splice(4).join("/")
      $("#" + popId).children(".bx-popup-content-ctn").children(".bx-popup-content").children(".image")[0].src = val;
      saveData= {
         "id":signPointEntity._id,
         "type": "point",
         "content":signPointEntity.title,
         "imagePath":newUrl,
      }
   }
   else if(type==6){
      let urlArr = val.split("/");
      let newUrl=urlArr.splice(4).join("/")
      signPointEntity._billboard._image._value=parent.httpConfig.nginxUrl+newUrl;;
      saveData= {
         "id":signPointEntity._id,
         "type": "point",
         "content":signPointEntity.title,
         "iconPath":newUrl,
      }
   }
   if(type==1||type==2||type==3||type==4){
@@ -1420,6 +1445,7 @@
function drawAjaxPoint(drawEntity){//加载点
   let cartesian = Cesium.Cartesian3.fromDegrees(drawEntity.longitude, drawEntity.latitude, drawEntity.height);
   var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
   let iconPath=drawEntity.iconPath?parent.httpConfig.nginxUrl+drawEntity.iconPath:"../assets/images/icon/icon1.png";
   var entity=viewer.entities.add({
      id:drawEntity.id,
      name:"drawPointEntity",
@@ -1438,7 +1464,7 @@
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000000000.0)
      },
      billboard: {
         image: "../assets/images/icon/icon1.png",
         image: iconPath,
         width: 40,
         height: 40,
         rotation: 0,
@@ -1575,6 +1601,7 @@
function drawAjaxLabel(drawEntity){//加载文字
   let cartesian = Cesium.Cartesian3.fromDegrees(drawEntity.longitude, drawEntity.latitude, drawEntity.height);
   var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
   let iconPath=drawEntity.iconPath?parent.httpConfig.nginxUrl+drawEntity.iconPath:"../assets/images/icon/icon1.png";
   var entity=viewer.entities.add({
      id:drawEntity.id,
      name:"drawLabelEntity",
@@ -1593,7 +1620,7 @@
         distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000000000.0)
      },
      billboard: {
         image: "../assets/images/icon/icon1.png",
         image: iconPath,
         width: 40,
         height: 40,
         rotation: 0,