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

public/static/lib/potree/potree.js

@@ -97132,12 +97132,17 @@ ENDSEC
 	    }
 	    
 	 
-	    
+	    dispose(){
+	        this.dispatchEvent('dispose');
+	        this.marker.parent.remove(this.marker);
+	        this.label && this.label.parent.remove(this.label);
+	        this.label2 && this.label2.parent.remove(this.label2);
+	    }
 
 	    
 	    
 	    addLabel(){ 
-	        this.removeTextLabel();
+	        this.label && this.label.parent.remove(this.label);
 	        this.label = new TextSprite$2(Object.assign({},
 	           labelProp, {text: this.id + "("+this.originID+")"}) //{text: `id:${this.id}, dataset:${this.pointcloud.name}, 4dkkId:${this.originID}`}
 	        ); 
@@ -97158,11 +97163,6 @@ ENDSEC
 	    }
 	     
 	    
-	    removeTextLabel(){
-	        if(this.label){ 
-	            this.label.parent.remove(this.label);
-	        }
-	    }
 	    
 	     
 	    
@@ -99056,7 +99056,7 @@ ENDSEC
 	        if(i>-1){
 	            this.panos.splice(i,1);
 	            this.currentPano == pano && (this.currentPano = null); 
-	            pano.dispatchEvent('dispose');
+	            pano.dispose();
 	        }
 	    }                                    
 	                                      

src/sdk/laser/core/enter.js

@@ -1580,15 +1580,16 @@ var enter = ({
             console.log('addPano', info)
             
         },
-        delReshoot({image}){
-            let pano = viewer.images360.panos.find(e=>e.panoData.imageSrc == image)
+        delReshoot({id}){
+            let pano = viewer.images360.getPano(id)
             if(pano) {
                 viewer.images360.deletePano(pano) 
             }
         },
         getCurrentPano(){
             let image = viewer.images360.currentPano?.panoData.imageSrc
-            return {image}
+            let id = viewer.images360.currentPano?.id 
+            return {image, id}
         }
         ,
         destroy(){//重新创建viewer，删了旧的