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

src/graphic/History/HistoryUtil.js

@@ -110,6 +110,7 @@ export default class HistoryUtil {
       mathUtil.equalPoint(roadEdge1.end, roadEdge2.end) &&
       roadEdge1.parent == roadEdge2.parent &&
       roadEdge1.style == roadEdge2.style &&
+      roadEdge1.weight == roadEdge2.weight &&
       roadEdge1.roadSide == roadEdge2.roadSide
     ) {
       return false;
@@ -370,6 +371,7 @@ export default class HistoryUtil {
     const roadEdgeInfo = {};
     roadEdgeInfo.vectorId = roadEdge1.vectorId;
     roadEdgeInfo.style = roadEdge2.style;
+    roadEdgeInfo.weight = roadEdge2.weight;
     roadEdgeInfo.start = { x: roadEdge2.start.x, y: roadEdge2.start.y };
     roadEdgeInfo.end = { x: roadEdge2.end.x, y: roadEdge2.end.y };
     roadEdgeInfo.parent = roadEdge2.parent;
@@ -630,6 +632,7 @@ export default class HistoryUtil {
     data.end = {};
     data.end = JSON.parse(JSON.stringify(roadEdge.end));
     data.style = roadEdge.style;
+    data.weight = roadEdge.weight;
     data.roadSide = roadEdge.roadSide;
     return data;
   }
@@ -844,6 +847,7 @@ export default class HistoryUtil {
     mathUtil.clonePoint(roadEdge.end, roadEdgeInfo.end);
     roadEdge.type = roadEdgeInfo.type;
     roadEdge.style = roadEdgeInfo.style;
+    roadEdge.weight = roadEdgeInfo.weight;
     roadEdge.roadSide = roadEdgeInfo.roadSide;
     if (roadEdge.roadSide) {
       roadEdge.setRoadSideWidth(roadEdge.roadSide.width);