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

# Conflicts:
#	src/graphic/Layer.js

public/static/lib/potree/potree.js

@@ -106155,25 +106155,25 @@ ENDSEC
 	        
 	        const fareast = 300;  
 	        //相机位置
-	        if(playerCamera.type == 'OrthographicCamera'){
-	            
-	            var finalDisToAim = 2;
-	             
+	        if(playerCamera.type == 'OrthographicCamera'){ 
+	            var finalDisToAim = 2; 
 	        }else {  
 	            var finalDisToAim =  dis>magDisMin ? dis > fareast ? magDisMax : (dis-magDisMin) / (fareast-magDisMin) * (magDisMax-magDisMin) + magDisMin :  dis / 2;    //dis>magDistance_ ? magDistance_ : dis / 2;
-	            
 	        }
 	         
-	        this.camera.position.copy(aimPos).add(dirToCamera.multiplyScalar(finalDisToAim));
-	        this.camera.lookAt(aimPos);
+	        
 	        this.camera.fov = playerCamera.type == 'OrthographicCamera' ? 30 : playerCamera.fov / 2;
 	        this.camera.updateProjectionMatrix();
 	        
+	        
 	        if(playerCamera.type == 'OrthographicCamera'){
-	            orthoView.position.copy(this.camera.position);
+	            orthoView.position.copy(aimPos).sub(viewer.mainViewport.view.direction.multiplyScalar(finalDisToAim));
 	            orthoView.yaw = viewer.mainViewport.view.yaw;
 	            orthoView.pitch = viewer.mainViewport.view.pitch;
 	            orthoView.applyToCamera(this.camera);
+	        }else {
+	            this.camera.position.copy(aimPos).add(dirToCamera.multiplyScalar(finalDisToAim));
+	            this.camera.lookAt(aimPos); 
 	        }
 
 	         

src/graphic/Layer.js

@@ -161,7 +161,20 @@ export default class Layer {
           this.history.save();
           this.renderer.autoRedraw();
         } else {
-          this.uiControl.prompt({ msg: "请先选择基准点", time: 1000 });
+          let points = dataService.vectorData.points;
+          let basePoints = []
+          for (let key in points) {
+            if (points[key].category == VectorCategory.Point.BasePoint) {
+              basePoints.push(points[key].vectorId)
+            }
+          }
+          if(basePoints.length==1){
+            this.uiControl.prompt({ msg: '请先选择基准点', time: 1000 });
+          }else{
+            this.uiControl.prompt({ msg: '请先添加基准点', time: 1000 });
+          }
+
+          // this.uiControl.prompt({ msg: '请先选择基准点', time: 1000 });
         }
         break;
       case LayerEvents.AddCircle:

src/graphic/Renderer/Draw.js

@@ -946,13 +946,20 @@ export default class Draw {
       ctx.restore();
     };
     let points = dataService.vectorData.points;
+    let basePoints = []
     for (let key in points) {
       if (points[key].category == VectorCategory.Point.BasePoint) {
-        Settings.selectBasePointId = points[key].vectorId;
+        basePoints.push(points[key].vectorId)
       }
     }
+    if(basePoints.length==1){
+      Settings.selectBasePointId = basePoints[0];
+    }else{
+      Settings.selectBasePointId =null
+    }
     let focusItem = stateService.getFocusItem()
-    if (Settings.selectBasePointId === vector.vectorId && focusItem?.vectorId == vector.vectorId ) {
+    // if (Settings.selectBasePointId === vector.vectorId && focusItem?.vectorId == vector.vectorId ) {
+    if (Settings.selectBasePointId === vector.vectorId  ) {
       style = {
         ...style,
         strokeStyle: "rgba(255,255,255,1)",
@@ -1022,7 +1029,7 @@ export default class Draw {
     }px Microsoft YaHei`;
     const bound = help.getTextCenter(this.context, vector.value)
 
-    console.log(vector)
+    // console.log(vector)
     const screen = coordinate.getScreenXY(vector.center)
     this.drawTextByInfo(
       // vector.center,

src/graphic/Service/DataService.js

@@ -134,6 +134,9 @@ export class DataService {
 
   deleteLine(lineId) {
     let line = this.getLine(lineId);
+    if(!line){
+      return
+    }
     let start = this.getPoint(line.startId);
     if (start) {
       let startParent = start.getParent();