xzw 4 maanden geleden
bovenliggende
commit
c9c1c129ea
1 gewijzigde bestanden met toevoegingen van 11 en 8 verwijderingen
  1. 11 8
      src/sdk/cover/index.js

+ 11 - 8
src/sdk/cover/index.js

@@ -704,13 +704,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                     requestInPano.result_.flyOutPano()
                 } */else{
                     Potree.settings.displayMode = 'showPointCloud'  
-                    if (o.modelId != void 0) {
-                        ['position', 'target'].forEach(e => { 
-                            if (o[e]) {
-                                o[e] = Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: o.modelId, position: o[e] })
-                            }
-                        })
-                    } 
+                    
                 }
                 viewer.scene.view.setView($.extend({}, o, {
                     duration: o.dur,
@@ -722,6 +716,15 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 return deferred.promise()
                 
             }
+            
+            if (o.modelId != void 0) {
+                ['position', 'target'].forEach(e => { //热点
+                    if (o[e]) {
+                        o[e] = Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: o.modelId, position: o[e] })
+                    }
+                })
+            } 
+            
            
             if (o.distance || o.maxDis) {
                 //o.isFlyToTag = true
@@ -732,7 +735,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                     if(r){
                         requestShowPano = true
                     }else{
-                        if(o.panoId != void 0 || o.modelId != void 0){ 
+                        if(o.panoId != void 0 || o.modelId != void 0 && o.target != void 0){ 
                             return fly()    //使用保存的视角
                              
                         }