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

wu

2024-01-24 12ae82141c1d6ed1a55922aae128ccfefb5b35dd

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

@@ -8,13 +8,13 @@
        active-class="blue-button"
        >{{ $t("Alarm") }}</router-link
      >
      <router-link
      <!-- <router-link
        to="/Electrical/State"
        tag="el-button"
        type="text"
        active-class="blue-button"
        >{{ $t("State") }}</router-link
      >
      > -->
      <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
        }}</router-link> -->
      <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
@@ -787,34 +787,34 @@
            }

            // 复位更新
            for (let i = 0; i < jsonData2.length; i++) {
              let arr = jsonData2[i];
              for (let j = 0; j < arr.length; j++) {
                let obj2 = arr[j];
                if (
                  obj2.button &&
                  (obj2.button.name === "复位" || obj2.button.name === "Reset")
                ) {
                  obj2.button.value = obj.fuwei[0][i];
                  //  console.log(obj2.button.value)
                }
              }
            }
            // for (let i = 0; i < jsonData2.length; i++) {
            //   let arr = jsonData2[i];
            //   for (let j = 0; j < arr.length; j++) {
            //     let obj2 = arr[j];
            //     if (
            //       obj2.button &&
            //       (obj2.button.name === "复位" || obj2.button.name === "Reset")
            //     ) {
            //       obj2.button.value = obj.fuwei[0][i];
            //       //  console.log(obj2.button.value)
            //     }
            //   }
            // }


            for (let i = 0; i < jsonData2.length; i++) {
              let arr = jsonData2[i];
              for (let j = 0; j < arr.length; j++) {
                let obj2 = arr[j];
                if (
                  obj2.button &&
                  (obj2.button.name === "回零" || obj2.button.name === "Home")
                ) {
                  obj2.button.value = obj.huiling[0][i];
                  //  console.log(obj2.button.value)
                }
              }
            }
            // for (let i = 0; i < jsonData2.length; i++) {
            //   let arr = jsonData2[i];
            //   for (let j = 0; j < arr.length; j++) {
            //     let obj2 = arr[j];
            //     if (
            //       obj2.button &&
            //       (obj2.button.name === "回零" || obj2.button.name === "Home")
            //     ) {
            //       obj2.button.value = obj.huiling[0][i];
            //       //  console.log(obj2.button.value)
            //     }
            //   }
            // }