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

public/static/lib/potree/potree.js

@@ -139524,14 +139524,17 @@ ENDSEC
 	                boundSize.x = Math.max(min, boundSize.x);
 	                boundSize.y = Math.max(min, boundSize.y);
 	            }
-	            if(camera.type == 'OrthographicCamera'){
-	                //dis = boundSize.length()   
-	                o.dontChangeCamDir = true; //强制不改方向
-	                //必须在模型外部
-	                this.mainViewport.targetPlane.setFromNormalAndCoplanarPoint(this.mainViewport.view.direction, this.bound.center ); 
-	                this.mainViewport.targetPlane.projectPoint(target,  this.mainViewport.shiftTarget ); //得到target在中心面的投影
-	                let pos = this.splitScreen.getPosOutOfModel(this.mainViewport, this.bound.size);  //得到观察位置（shiftTarget投影到模型外部）
-	                dis = pos.distanceTo(target);   
+	            if(camera.type == 'OrthographicCamera'){ 
+	                if(o.dontChangeCamDir) {
+	                    //必须在模型外部(如点击测量线时)
+	                    this.mainViewport.targetPlane.setFromNormalAndCoplanarPoint(this.mainViewport.view.direction, this.bound.center ); 
+	                    this.mainViewport.targetPlane.projectPoint(target,  this.mainViewport.shiftTarget ); //得到target在中心面的投影
+	                    let pos = this.splitScreen.getPosOutOfModel(this.mainViewport, this.bound.size);  //得到观察位置（shiftTarget投影到模型外部）
+	                    dis = pos.distanceTo(target);  
+	                }else {
+	                    dis = boundSize.length(); 
+	                }                   
+	                
 	            }else {
 	                let aspect = boundSize.x / boundSize.y;
 	                if(camera.aspect > aspect){//视野更宽则用bound的纵向来决定

src/graphic/Renderer/Draw.js

@@ -1161,6 +1161,9 @@ export default class Draw {
 
   // 文字
   drawText(vector) {
+    if (!vector.value) {
+      return;
+    }
     this.context.save();
     const [_, foo] = help.setVectorStyle(this.context, vector);
 

src/views/scene/covers/fixPoints.vue

@@ -23,7 +23,13 @@
     />
   </div>
 
-  <EditFixPoint v-if="edit" @quit="edit = null" v-model:text="edit.text" ref="dom" />
+  <EditFixPoint
+    v-if="edit"
+    @quit="edit = null"
+    v-model:text="edit.text"
+    ref="dom"
+    :key="edit.id"
+  />
 </template>
 
 <script setup lang="ts">
@@ -35,6 +41,12 @@ import ActionMenus from "@/components/group-button/index.vue";
 import EditFixPoint from "@/components/edit-fix-point/index.vue";
 
 const edit = ref<FixPoint>();
+watchEffect(() => {
+  if (edit.value !== customMap.activeFixPoint) {
+    edit.value = null;
+  }
+});
+
 const activeActionMenus = [
   {
     key: "edit",
@@ -45,6 +57,8 @@ const activeActionMenus = [
     onClick() {
       edit.value =
         edit.value === customMap.activeFixPoint ? null : customMap.activeFixPoint;
+
+      console.log(edit.value);
     },
   },
   {