Merge branch 'dev' of http://192.168.0.115:3000/bill/traffic-laser into dev

public/static/lib/potree/potree.js

@@ -75662,17 +75662,9 @@ void main()
 	            scene.addPointCloud(pointcloud);
 	            
 	              
-	             
-	             
-	        
-	            Potree.loadPanos( (data) => { 
-	                //console.log('loadPanos',dataset.sceneCode, dataset.id, data)
-	                viewer.images360.addPanoData(data  ); 
-	                viewer.images360.loadDone(); 
-	                viewer.scene.add360Images(viewer.images360); 
-	               
+	            let done = ()=>{
 	                viewer.updateModelBound(); //需等pano加载完
-	              
+	                  
 	                let {boundSize, center} = viewer.bound;
 	                 
 	                viewer.dispatchEvent({type:'loadPointCloudDone'});
@@ -75710,15 +75702,27 @@ void main()
 	                 
 	                 
 	                let boxHelper = new Potree.Box3Helper(viewer.bound.boundingBox);
-					boxHelper.matrixAutoUpdate = false; 
+	                boxHelper.matrixAutoUpdate = false; 
 	                viewer.scene.scene.add(boxHelper); 
 	                viewer.bound.boxHelper = boxHelper;
 	                boxHelper.visible = false;
 	                
 	                console.log('allLoaded');
 	                viewer.dispatchEvent('allLoaded');
-	            }); 
-	                
+	            };
+	            
+	            
+	            if(Potree.settings.noPanos){
+	                done();
+	            }else { 
+	                Potree.loadPanos( (data) => { 
+	                    //console.log('loadPanos',dataset.sceneCode, dataset.id, data)
+	                    viewer.images360.addPanoData(data  ); 
+	                    viewer.images360.loadDone(); 
+	                    viewer.scene.add360Images(viewer.images360); 
+	                    done(); 
+	                }); 
+	            }
 	        }); 
 	        
 	    } 

src/sdk/laser/core/enter.js

@@ -72,6 +72,7 @@ var enter = ({
 
     if(isTemp){
         Potree.settings.cloudPath = Potree.settings.urls.prefix1 + '/result/reconstruction/webcloud/cloud.js'
+        Potree.settings.noPanos = true
     }
     
     Potree.start(dom, mapDom, number);