xushiting 2 years ago
parent
commit
456b7e64f4

File diff suppressed because it is too large
+ 1 - 1
server/test/SS-t-P1d6CwREny2/attach/sceneStore


+ 1 - 0
src/graphic/Controls/MovePoint.js

@@ -22,6 +22,7 @@ export default class MovePoint {
       let parent = point.getParent();
       let parent = point.getParent();
       for (let key in parent) {
       for (let key in parent) {
         let line = dataService.getLine(key);
         let line = dataService.getLine(key);
+        line.setValue(null);
         //拖拽的点是基准线
         //拖拽的点是基准线
         if (line.category == VectorCategory.Line.BaseLine) {
         if (line.category == VectorCategory.Line.BaseLine) {
           let points = dataService.getPoints();
           let points = dataService.getPoints();

+ 24 - 4
src/graphic/ListenLayer.js

@@ -125,7 +125,8 @@ export default class ListenLayer {
         if (Math.abs(position.x - point.x) < Constant.minAdsorbPix) {
         if (Math.abs(position.x - point.x) < Constant.minAdsorbPix) {
           seqInfo.linkedPointIdX = pointId;
           seqInfo.linkedPointIdX = pointId;
           seqInfo.x = point.x;
           seqInfo.x = point.x;
-        } else if (Math.abs(position.y - point.y) < Constant.minAdsorbPix) {
+        }
+        if (Math.abs(position.y - point.y) < Constant.minAdsorbPix) {
           seqInfo.linkedPointIdY = pointId;
           seqInfo.linkedPointIdY = pointId;
           seqInfo.y = point.y;
           seqInfo.y = point.y;
         }
         }
@@ -141,7 +142,8 @@ export default class ListenLayer {
       if (seqInfo.hasOwnProperty("linkedPointIdX")) {
       if (seqInfo.hasOwnProperty("linkedPointIdX")) {
         pointInfo.linkedPointIdX = seqInfo.linkedPointIdX;
         pointInfo.linkedPointIdX = seqInfo.linkedPointIdX;
         pointInfo.x = seqInfo.x;
         pointInfo.x = seqInfo.x;
-      } else if (seqInfo.hasOwnProperty("linkedPointIdY")) {
+      }
+      if (seqInfo.hasOwnProperty("linkedPointIdY")) {
         pointInfo.linkedPointIdY = seqInfo.linkedPointIdY;
         pointInfo.linkedPointIdY = seqInfo.linkedPointIdY;
         pointInfo.y = seqInfo.y;
         pointInfo.y = seqInfo.y;
       }
       }
@@ -990,13 +992,31 @@ export default class ListenLayer {
         info.curvePointInfo.linkedRoadPointIdY;
         info.curvePointInfo.linkedRoadPointIdY;
       this.modifyPoint.y = info.curvePointInfo.y;
       this.modifyPoint.y = info.curvePointInfo.y;
       this.modifyPoint.x = position.x;
       this.modifyPoint.x = position.x;
-    } else if (info && info.pointInfo.linkedPointIdX) {
+    } else if (
+      info &&
+      info.pointInfo.linkedPointIdX &&
+      !info.pointInfo.linkedPointIdY
+    ) {
       this.modifyPoint = {};
       this.modifyPoint = {};
       this.modifyPoint.linkedPointIdX = info.pointInfo.linkedPointIdX;
       this.modifyPoint.linkedPointIdX = info.pointInfo.linkedPointIdX;
       this.modifyPoint.x = info.pointInfo.x;
       this.modifyPoint.x = info.pointInfo.x;
       this.modifyPoint.y = info.pointInfo.y;
       this.modifyPoint.y = info.pointInfo.y;
-    } else if (info && info.pointInfo.linkedPointIdY) {
+    } else if (
+      info &&
+      info.pointInfo.linkedPointIdY &&
+      !info.pointInfo.linkedPointIdX
+    ) {
+      this.modifyPoint = {};
+      this.modifyPoint.linkedPointIdY = info.pointInfo.linkedPointIdY;
+      this.modifyPoint.y = info.pointInfo.y;
+      this.modifyPoint.x = info.pointInfo.x;
+    } else if (
+      info &&
+      info.pointInfo.linkedPointIdY &&
+      info.pointInfo.linkedPointIdX
+    ) {
       this.modifyPoint = {};
       this.modifyPoint = {};
+      this.modifyPoint.linkedPointIdX = info.pointInfo.linkedPointIdX;
       this.modifyPoint.linkedPointIdY = info.pointInfo.linkedPointIdY;
       this.modifyPoint.linkedPointIdY = info.pointInfo.linkedPointIdY;
       this.modifyPoint.y = info.pointInfo.y;
       this.modifyPoint.y = info.pointInfo.y;
       this.modifyPoint.x = info.pointInfo.x;
       this.modifyPoint.x = info.pointInfo.x;