Forráskód Böngészése

fix:弯路添加控制点后撤销,撤销后现场绘图画布界面无法操作

jinx 1 éve
szülő
commit
921b8ea7a1
2 módosított fájl, 12 hozzáadás és 7 törlés
  1. 11 6
      src/graphic/History/HistoryUtil.js
  2. 1 1
      src/main.ts

+ 11 - 6
src/graphic/History/HistoryUtil.js

@@ -262,8 +262,9 @@ export default class HistoryUtil {
       mathUtil.equalPoints(curveRoadEdge1.points, curveRoadEdge2.points) &&
       curveRoadEdge1.parent == curveRoadEdge2.parent &&
       curveRoadEdge1.style == curveRoadEdge2.style &&
-      curveRoadEdge1.weight == curveRoadEdge2.weight &&
-      curveRoadEdge1.roadSide == curveRoadEdge2.roadSide 
+      curveRoadEdge1.weight == curveRoadEdge2.weight 
+      // &&
+      // curveRoadEdge1.roadSide == curveRoadEdge2.roadSide 
     ) {
       return false;
     } else {
@@ -516,7 +517,7 @@ export default class HistoryUtil {
     curveRoadEdgeInfo.parent = curveRoadEdge2.parent;
     curveRoadEdgeInfo.style = curveRoadEdge2.style;
     curveRoadEdgeInfo.weight = curveRoadEdge2.weight;
-    curveRoadEdgeInfo.roadSide == curveRoadEdge2.roadSide 
+    // curveRoadEdgeInfo.roadSide == curveRoadEdge2.roadSide 
     this.setCurveRoadEdgeInfo(curveRoadEdgeInfo);
   }
 
@@ -786,7 +787,7 @@ export default class HistoryUtil {
     data.curves = JSON.parse(JSON.stringify(curveRoadEdge.curves));
     data.style = curveRoadEdge.style;
     data.weight = curveRoadEdge.weight;
-    data.roadSide == curveRoadEdge.roadSide 
+    // data.roadSide == curveRoadEdge.roadSide 
     return data;
   }
 
@@ -998,12 +999,14 @@ export default class HistoryUtil {
   }
 
   setCurveRoadEdgeInfo(curveRoadEdgeInfo) {
+    console.error(1)
     let curveRoadEdge = dataService.getCurveRoadEdge(
       curveRoadEdgeInfo.vectorId
     );
     curveRoadEdge.vectorId = curveRoadEdgeInfo.vectorId;
     mathUtil.clonePoint(curveRoadEdge.start, curveRoadEdgeInfo.start);
     mathUtil.clonePoint(curveRoadEdge.end, curveRoadEdgeInfo.end);
+    curveRoadEdge.points = []
     for (let i = 0; i < curveRoadEdgeInfo.points.length; ++i) {
       curveRoadEdge.points[i] = {};
       mathUtil.clonePoint(curveRoadEdge.points[i], curveRoadEdgeInfo.points[i]);
@@ -1013,7 +1016,7 @@ export default class HistoryUtil {
     curveRoadEdge.type = curveRoadEdgeInfo.type;
     curveRoadEdge.style = curveRoadEdgeInfo.style;
     curveRoadEdge.weight = curveRoadEdgeInfo.weight;
-    curveRoadEdge.roadSide == curveRoadEdgeInfo.roadSide 
+    // curveRoadEdge.roadSide == curveRoadEdgeInfo.roadSide 
   }
 
   setCurveRoadInfo(curveRoadInfo) {
@@ -1023,12 +1026,14 @@ export default class HistoryUtil {
     curveRoad.endId = curveRoadInfo.endId;
     curveRoad.leftEdgeId = curveRoadInfo.leftEdgeId;
     curveRoad.rightEdgeId = curveRoadInfo.rightEdgeId;
+    curveRoad.points=[]
     for (let i = 0; i < curveRoadInfo.points.length; ++i) {
       curveRoad.points[i] = dataService.getCurveRoadPoint(
         curveRoadInfo.points[i].vectorId
       );
+    
     }
-    //curveRoad.points = JSON.parse(JSON.stringify(curveRoadInfo.points));
+    // curveRoad.points = JSON.parse(JSON.stringify(curveRoadInfo.points));
     curveRoad.curves = JSON.parse(JSON.stringify(curveRoadInfo.curves));
 
     if (curveRoad.way == Constant.oneWay) {

+ 1 - 1
src/main.ts

@@ -2,7 +2,7 @@ import VConsole from "vconsole";
 import { useParams } from "@/hook/useParams";
 
 // if (useParams().console === "true") {
-new VConsole();
+// new VConsole();
 // }
 
 import "@/assets/theme.editor.scss";