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

ZengTao

2024-01-23 34e3a25ba518faca7b65550d3b38a6939bff6642

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

@@ -43,13 +43,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"
@@ -89,6 +89,14 @@
        type="text"
        active-class="blue-button"
        >{{ $t("Speed parameter settings") }}</router-link
      >

      <router-link 
        to="/Electrical/InteractionState"
        tag="el-button"
        type="text"
        active-class="blue-button"
        >{{ $t("InteractionState") }}</router-link
      >
    </el-breadcrumb>

@@ -502,7 +510,7 @@
      }

      if (currentButtonName === "回零" || currentButtonName === "Home") {
        const data3 = [];
       
        const resetButtonValues3 = this.jsonData
          .map((item) => {
            const buttonItem3 = item.find(
@@ -515,14 +523,14 @@
          .filter((value) => value !== null);

        // 将得到的值添加到 data 数组中
        data3.push(resetButtonValues3.flat());
        data.push(resetButtonValues3.flat());

        // 在 data3 数组前面添加两个空数组
        data3.unshift([], [], []);
        data3.push([], [], [], []);
        data.unshift([], [], []);
        data.push([], [], [], []);

        // 创建 jsonObject3 对象，并添加 data3 属性
        jsonObject = { data: data3 };
        jsonObject = { data };
      }
      if (
        currentButtonName === "A01半自动" ||
@@ -657,6 +665,19 @@
      const jsonString = JSON.stringify(jsonObject);
      console.log("所有Type为0的value:", jsonString);
      socket?.send(jsonString);

      setTimeout(() => {
    const reversedData = data.map(values => values.map(value => {
      return   (!value || value === 0) ? 0 : 0 ;
    }));

    const reversedJsonObject = { data: reversedData };

    // 提交数据到后端
    const reversedJsonString = JSON.stringify(reversedJsonObject);
    console.log('反转后:', reversedJsonString);
    socket?.send(reversedJsonString);
  }, 1000);
    },

    initWebSocket() {
@@ -780,6 +801,23 @@
              }
            }


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

            

            //未回零更新

            jsonData2[2][3].button.value = weihuiling[0][0];