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

ZengTao

2024-05-09 63574bf6cf94613385cb8d0e2c2beb1829f644b5

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

@@ -1,38 +1,55 @@
<template>

  <div class="app">

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')

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

      }}</router-link> -->

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

      }}</router-link>

      <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{

        $t('Manual/Automatic')

      }}</router-link>

      <router-link

        to="/Electrical/alarm"

        tag="el-button"

        type="text"

        active-class="blue-button"

        >{{ $t("Alarm") }}</router-link

      >

     
      <router-link

        to="/Electrical/Sign"

        tag="el-button"

        type="text"

        active-class="blue-button"

        >{{ $t("I/O") }}</router-link

      >

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

        tag="el-button"

        type="text"

        active-class="blue-button"

        >{{ $t("Manual/Automatic") }}</router-link

      >

    </el-breadcrumb>



    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Automatic State')

      }}</router-link>

      <!-- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{

        $t('ManualJog')

      }}</router-link> -->

      <router-link

        to="/Electrical/Parameter2"

        tag="el-button"

        type="text"

        active-class="blue-button"

        >{{ $t("Glass Data") }}</router-link

      >

      

       <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{

        $t('ManualonePosition')

      }}</router-link>



<router-link v-if="hasPermission" to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">

      <router-link

        to="/Electrical/ManualonePosition"

        tag="el-button"

        type="text"

        active-class="blue-button"

        >{{ $t("Manual Control") }}</router-link

      >



      <router-link v-show="false" v-if="hasPermission" to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">

    {{ $t('Servomanualone') }}

  </router-link>

      

     

      <router-link   v-if="hasPermission" to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{

        $t('Address parameter settings')

        $t('Cage Positions')

      }}</router-link>

  

      <router-link   v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{

@@ -44,9 +61,8 @@
        tag="el-button"

        type="text"

        active-class="blue-button"

        >{{ $t("InteractionState") }}</router-link

        >{{ $t("PLC-MES Info") }}</router-link

      >

      
    </el-breadcrumb>



    <el-row :gutter="10">

@@ -78,7 +94,7 @@
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">

              <el-button v-if="item.button && language === 'en-US' && item.state != 0" :name="item.button.name"

                v-model="item.button.value"

                :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 1,'error-button3': item.button.name === 'Zero' && item.button.value === 0,'greenbutton': item.button.name !== 'NotZero' && item.button.name !== 'Fault' && item.button.value === 1 }"

                :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'Homing Failure' && item.button.value === 1,'error-button3': item.button.name === 'Homing Complete' && item.button.value === 0,'greenbutton': item.button.name !== 'Homing Failure' && item.button.name !== 'Fault' && item.button.value === 1 }"

                @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{

                  item.button.name }}</el-button>

              <el-button v-if="item.button && language === 'zh-CN' && item.state != 0" :name="item.button.name"

@@ -129,7 +145,7 @@
    }

  },

  activated () {



    document.body.style.zoom = "90%";

    this.initWebSocket();

    const language = this.$i18n.locale;

    //console.log(language);

@@ -590,7 +606,7 @@


  if(obj.zuhe1){



 console.log(obj);

 //console.log(obj);

  

              // 执行更新逻辑

              for (let i = 0; i < 4; i++) {

@@ -689,7 +705,7 @@
                for (let j = 2; j < arr2.length; j++) {

                  let obj3 = arr2[j];

                  if (obj3.button) {

                    if (obj3.button && (obj3.button.name === "未回零" || obj3.button.name === "NotZero" || obj3.button.name === "已回零" || obj3.button.name === "Zero")) {

                    if (obj3.button && (obj3.button.name === "未回零" || obj3.button.name === "Homing Failure" || obj3.button.name === "已回零" || obj3.button.name === "Homing Complete")) {

                      obj3.button.value = weihuiling[0][i];

                      //  console.log(obj3.button.value)

                    }

@@ -711,16 +727,16 @@
      if ( obj.button.name==="未回零" && this.language==="zh-CN") {

      obj.button.name =obj.button.name.replace("未回零","已回零") ;

    }

    if ( obj.button.name==="NotZero") {

      obj.button.name =obj.button.name.replace("NotZero","Zero") ;

    if ( obj.button.name==="Homing Failure") {

      obj.button.name =obj.button.name.replace("Homing Failure","Homing Complete") ;

    }

  }

  if (obj.button && obj.button.value===1) {

      if ( obj.button.name==="已回零"&& this.language==="zh-CN") {

      obj.button.name =obj.button.name.replace("已回零","未回零") ;

    }

    if ( obj.button.name==="Zero") {

      obj.button.name =obj.button.name.replace("Zero","NotZero") ;

    if ( obj.button.name==="Homing Complete") {

      obj.button.name =obj.button.name.replace("Homing Complete","Homing Failure") ;

    }

  }