Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2024-01-15 a32b9d4d64094df2f6a8df3420839a96e9469ca2

 CanadaMes-ui/src/views/Electrical/Positioning1.vue

@@ -48,13 +48,13 @@
        active-class="blue-button"
        >{{ $t("Automatic State") }}</router-link
      >
      <router-link
      <!-- <router-link
        to="/Electrical/ManualJog"
        tag="el-button"
        type="text"
        active-class="blue-button"
        >{{ $t("ManualJog") }}</router-link
      >
      > -->

      <router-link
        to="/Electrical/ManualonePosition"