Browse Source

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

bill 1 year ago
parent
commit
2bdc0b8084
2 changed files with 8 additions and 8 deletions
  1. 1 1
      src/graphic/History/HistoryUtil.js
  2. 7 7
      src/views/graphic/geos/roadEdge.vue

+ 1 - 1
src/graphic/History/HistoryUtil.js

@@ -516,7 +516,7 @@ export default class HistoryUtil {
     curveRoadEdgeInfo.parent = curveRoadEdge2.parent;
     curveRoadEdgeInfo.style = curveRoadEdge2.style;
     curveRoadEdgeInfo.weight = curveRoadEdge2.weight;
-    curveRoadPointInfo.roadSide == curveRoadEdge2.roadSide 
+    curveRoadEdgeInfo.roadSide == curveRoadEdge2.roadSide 
     this.setCurveRoadEdgeInfo(curveRoadEdgeInfo);
   }
 

+ 7 - 7
src/views/graphic/geos/roadEdge.vue

@@ -114,13 +114,13 @@ const menus = ref([
 
 watchEffect(() => {
   if (style.value === VectorStyle.RoadSide) {
-    if (vector.value.geoType == VectorType.CurveRoadEdge) {
-      menus.value[1] = lineWidthMenu[2];
-      lineWidthMenu[2].desc = vector.value.roadSide.width * 1000;
-    } else {
-      menus.value[1] = lineWidthMenu[2];
-      lineWidthMenu[2].desc = vector.value.roadSide.width * 1000;
-    }
+    // if (vector.value.geoType == VectorType.CurveRoadEdge) {
+    // menus.value[1] = lineWidthMenu[2];
+    // lineWidthMenu[2].desc = vector.value.roadSide.width * 1000;
+    // } else {
+    menus.value[1] = lineWidthMenu[2];
+    lineWidthMenu[2].desc = vector.value.roadSide.width * 1000;
+    // }
   } else {
     (menus.value[1] = vector.value?.weight === VectorWeight.Bold ? lineWidthMenu[0] : lineWidthMenu[1]), (showChange.value = false);
   }