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

ZengTao

2024-05-09 63574bf6cf94613385cb8d0e2c2beb1829f644b5

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

@@ -24,7 +24,7 @@
        tag="el-button"
        type="text"
        active-class="blue-button"
        >{{ $t("Sign") }}</router-link
        >{{ $t("I/O") }}</router-link
      >
      <router-link
        to="/Electrical/Servomanual"
@@ -41,7 +41,7 @@
        tag="el-button"
        type="text"
        active-class="blue-button"
        >{{ $t("Automatic State") }}</router-link
        >{{ $t("Glass Data") }}</router-link
      >
      <!-- <router-link
        to="/Electrical/ManualJog"
@@ -56,14 +56,14 @@
        tag="el-button"
        type="text"
        active-class="blue-button"
        >{{ $t("ManualonePosition") }}</router-link
        >{{ $t("Manual Control") }}</router-link
      >

      <router-link
        to="/Electrical/Servomanualone"
        tag="el-button"
        type="text"
        active-class="blue-button"
        active-class="blue-button" v-show="false"
        >{{ $t("Servomanualone") }}</router-link
      >
      <!-- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
@@ -74,7 +74,7 @@
        tag="el-button"
        type="text"
        active-class="blue-button"
        >{{ $t("Address parameter settings") }}</router-link
        >{{ $t("Cage Positions") }}</router-link
      >
      <!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
@@ -96,7 +96,7 @@
        tag="el-button"
        type="text"
        active-class="blue-button"
        >{{ $t("InteractionState") }}</router-link
        >{{ $t("PLC-MES Info") }}</router-link
      >
    </el-breadcrumb>

@@ -195,9 +195,9 @@
                  'error-button':
                    item.button.name === 'Fault' && item.button.value === 1,
                  'error-button2':
                    item.button.name === 'NotZero' && item.button.value === 1,
                    item.button.name === 'Homing Failure' && item.button.value === 1,
                  'error-button3':
                    item.button.name === 'Zero' && item.button.value === 0,
                    item.button.name === 'Homing Complete' && item.button.value === 0,
                  fuwei:
                    item.button.name === 'Reset' && item.button.value === 1,
                  huiling:
@@ -221,7 +221,7 @@
                    item.button.name === 'Abort/ResumeTasks' &&
                    item.button.value === 1,
                  yihuiling:
                    item.button.name === 'Zero' && item.button.value === 1,
                    item.button.name === 'Homing Complete' && item.button.value === 1,
                }"
                @click="
                  updateButtonValue(dataGroup, itemIndex);
@@ -298,6 +298,7 @@
  },

  activated() {
    document.body.style.zoom = "90%";
    this.initWebSocket();
    const language = this.$i18n.locale;
    // console.log(language);
@@ -833,7 +834,7 @@
            // console.log(jsonData2[5][4].button.value)
            if (
              jsonData2[2][3].button.value === 0 &&
              (jsonData2[2][3].button.name === "NotZero" ||
              (jsonData2[2][3].button.name === "Homing Failure" ||
                jsonData2[2][3].button.name === "未回零")
            ) {
              jsonData2[2][3].button.name = jsonData2[2][3].button.name.replace(
@@ -841,13 +842,13 @@
                "已回零"
              );
              jsonData2[2][3].button.name = jsonData2[2][3].button.name.replace(
                "NotZero",
                "Zero"
                "Homing Failure",
                "Homing Complete"
              );
            }
            if (
              jsonData2[3][3].button.value === 0 &&
              (jsonData2[3][3].button.name === "NotZero" ||
              (jsonData2[3][3].button.name === "Homing Failure" ||
                jsonData2[3][3].button.name === "未回零")
            ) {
              jsonData2[3][3].button.name = jsonData2[3][3].button.name.replace(
@@ -855,13 +856,13 @@
                "已回零"
              );
              jsonData2[3][3].button.name = jsonData2[3][3].button.name.replace(
                "NotZero",
                "Zero"
                "Homing Failure",
                "Homing Complete"
              );
            }
            if (
              jsonData2[4][4].button.value === 0 &&
              (jsonData2[4][4].button.name === "NotZero" ||
              (jsonData2[4][4].button.name === "Homing Failure" ||
                jsonData2[4][4].button.name === "未回零")
            ) {
              jsonData2[4][4].button.name = jsonData2[4][4].button.name.replace(
@@ -869,13 +870,13 @@
                "已回零"
              );
              jsonData2[4][4].button.name = jsonData2[4][4].button.name.replace(
                "NotZero",
                "Zero"
                "Homing Failure",
                "Homing Complete"
              );
            }
            if (
              jsonData2[5][4].button.value === 0 &&
              (jsonData2[5][4].button.name === "NotZero" ||
              (jsonData2[5][4].button.name === "Homing Failure" ||
                jsonData2[5][4].button.name === "未回零")
            ) {
              jsonData2[5][4].button.name = jsonData2[5][4].button.name.replace(
@@ -883,14 +884,14 @@
                "已回零"
              );
              jsonData2[5][4].button.name = jsonData2[5][4].button.name.replace(
                "NotZero",
                "Zero"
                "Homing Failure",
                "Homing Complete"
              );
            }

            if (
              jsonData2[2][3].button.value === 1 &&
              (jsonData2[2][3].button.name === "Zero" ||
              (jsonData2[2][3].button.name === "Homing Complete" ||
                jsonData2[2][3].button.name === "已回零")
            ) {
              jsonData2[2][3].button.name = jsonData2[2][3].button.name.replace(
@@ -898,13 +899,13 @@
                "未回零"
              );
              jsonData2[2][3].button.name = jsonData2[2][3].button.name.replace(
                "Zero",
                "NotZero"
                "Homing Complete",
                "Homing Failure"
              );
            }
            if (
              jsonData2[3][3].button.value === 1 &&
              (jsonData2[3][3].button.name === "Zero" ||
              (jsonData2[3][3].button.name === "Homing Complete" ||
                jsonData2[3][3].button.name === "已回零")
            ) {
              jsonData2[3][3].button.name = jsonData2[3][3].button.name.replace(
@@ -912,13 +913,13 @@
                "未回零"
              );
              jsonData2[3][3].button.name = jsonData2[3][3].button.name.replace(
                "Zero",
                "NotZero"
                "Homing Complete",
                "Homing Failure"
              );
            }
            if (
              jsonData2[4][4].button.value === 1 &&
              (jsonData2[4][4].button.name === "Zero" ||
              (jsonData2[4][4].button.name === "Homing Complete" ||
                jsonData2[4][4].button.name === "已回零")
            ) {
              jsonData2[4][4].button.name = jsonData2[4][4].button.name.replace(
@@ -926,13 +927,13 @@
                "未回零"
              );
              jsonData2[4][4].button.name = jsonData2[4][4].button.name.replace(
                "Zero",
                "NotZero"
                "Homing Complete",
                "Homing Failure"
              );
            }
            if (
              jsonData2[5][4].button.value === 1 &&
              (jsonData2[5][4].button.name === "Zero" ||
              (jsonData2[5][4].button.name === "Homing Complete" ||
                jsonData2[5][4].button.name === "已回零")
            ) {
              jsonData2[5][4].button.name = jsonData2[5][4].button.name.replace(
@@ -940,8 +941,8 @@
                "未回零"
              );
              jsonData2[5][4].button.name = jsonData2[5][4].button.name.replace(
                "Zero",
                "NotZero"
                "Homing Complete",
                "Homing Failure"
              );
            }
          }