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

src/components/vrange/index.vue

@@ -30,7 +30,7 @@
     </div>
     <span
       class="fun-ctrl"
-      @click="emit('update:value', value + step > min ? value + step : value)"
+      @click="emit('update:value', value + step < max ? value + step : value)"
     >
       +
     </span>

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);
   }
 

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);
   }

src/views/scene/covers/measure.vue

@@ -31,6 +31,7 @@ const measure = computed(() => {
 watchEffect(() => {
   if (measure.value) {
     measure.value.bus.on("selected", (focus) => {
+      console.log("===>");
       if (focus) {
         emit("focus");
       } else {

src/views/scene/menus/pane.vue

@@ -90,7 +90,7 @@ const stopWatch = joinActions(store.itemActiveKey);
 onUnmounted(() => {
   stopWatch();
   if (props.parentKey === "measure") {
-    laserModeStack.pop();
+    // laserModeStack.pop();
   }
 });
 onMounted(() => {
@@ -105,7 +105,7 @@ onMounted(() => {
     store.itemActiveKey.value = defaultMenu?.key;
     // store.activeMenuKey.value =
     if (props.parentKey === "measure") {
-      laserModeStack.push(ref(Mode.pano));
+      // laserModeStack.push(ref(Mode.pano));
     }
   }
 });