action 去除

wuyouming666

2023-12-14 84bb4d6cb579ee49e9a28c7507eabdf793a3a21e

action 去除

 CanadaMes-ui/src/configuration/ManualJog.json

@@ -4,6 +4,7 @@
      "button": {
        "name": "D01输送",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -13,6 +14,7 @@
      "button": {
        "name": "D02输送",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -22,6 +24,7 @@
      "button": {
        "name": "D03输送",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -31,6 +34,7 @@
      "button": {
        "name": "D04输送",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -40,6 +44,7 @@
      "button": {
        "name": "D05输送",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -49,6 +54,7 @@
      "button": {
        "name": "D06输送",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -58,6 +64,7 @@
      "button": {
        "name": "A01输送正向",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -67,6 +74,7 @@
      "button": {
        "name": "A01输送反向",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -77,6 +85,7 @@
      "button": {
        "name": "A01行走点动",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -86,6 +95,7 @@
      "button": {
        "name": "A01翻转",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -95,6 +105,7 @@
      "button": {
        "name": "A01注电泵",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -104,6 +115,7 @@
      "button": {
        "name": "A02输送正向",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -113,6 +125,7 @@
      "button": {
        "name": "A02输送反向",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -122,6 +135,7 @@
      "button": {
        "name": "A02行走点动",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -131,6 +145,7 @@
      "button": {
        "name": "A02翻转",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -143,6 +158,7 @@
      "button": {
        "name": "A02注电泵",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -152,6 +168,7 @@
      "button": {
        "name": "B01输送",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -161,6 +178,7 @@
      "button": {
        "name": "B01行走点动",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -171,6 +189,7 @@
      "button": {
        "name": "B01翻转气缸",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -180,6 +199,7 @@
      "button": {
        "name": "B01升降气缸",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -188,6 +208,7 @@
      "button": {
        "name": "B01吹气",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -197,6 +218,7 @@
      "button": {
        "name": "B02输送",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -210,6 +232,7 @@
      "button": {
        "name": "B02行走点动",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },
@@ -219,6 +242,7 @@
      "button": {
        "name": "B02翻转气缸",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -228,6 +252,7 @@
      "button": {
        "name": "B02升降气缸",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 0
      },
@@ -237,6 +262,7 @@
      "button": {
        "name": "B02吹气",
        "value": 0,
 "value2": 0,
        "address": "DB10.0",
        "state": 1
      },

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

@@ -6,8 +6,8 @@
      }}</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/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')

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

@@ -5,8 +5,8 @@
      }}</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/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')
@@ -60,11 +60,18 @@
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'"
              <!-- <el-input v-if="item.type === '0'"
            v-model="item.value"
            class="input-box"
            :oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`"
            @keyup.enter.native="submitDataToBackend">
  </el-input> -->

  <el-input v-if="item.type === '0'"
            v-model="item.value"
            class="input-box"
           
            @keyup.enter.native="submitDataToBackend">
  </el-input>

                <span v-if="item.unit" :name="item.unit"  >{{ item.unit }}</span>

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

@@ -5,8 +5,8 @@
      }}</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/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')
@@ -55,8 +55,8 @@

          <div class="button-row" style="display: flex; justify-content: flex-start;flex-wrap:wrap;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" style="margin: 10px;">
              <el-button v-if="item.button" :name="item.button.name" style='width:200px;'
 :class="{ 'dow': false, 'op': item.button.value === 1 }" class="action-button"
              <el-button v-if="item.button"   v-model="item.button.value"   :name="item.button.name" style='width:200px;'
 :class="{ 'dow': item.button.value === 0, 'op': item.button.value === 1 }" class="action-button"
 @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{
 item.button.name
 }}</el-button>
@@ -89,7 +89,7 @@
    if (language === 'en-US') {
      this.replaceChineseWithEnglish();
    }
    this.$forceUpdate();
    // this.$forceUpdate();


  },
@@ -99,19 +99,19 @@
      socket.close();
    },
    updateButtonValue (dataGroup, itemIndex) {
      if (dataGroup[itemIndex].button.value === 1) {
      if (dataGroup[itemIndex].button.value2 === 0) {
    // 如果当前按钮的值是 0，将其设为 1
    this.$set(dataGroup[itemIndex].button, 'value', 0);
    this.$set(dataGroup[itemIndex].button, 'value2', 1);
  } else {
    // 否则将其设为 0
    this.$set(dataGroup[itemIndex].button, 'value', 1);
    this.$set(dataGroup[itemIndex].button, 'value2', 0);
  }
    },
    submitDataToBackend () {
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '3') {
            return { value: item.button.value };
            return { value: item.button.value2 };
          }
          return null;
        });
@@ -168,16 +168,14 @@
          let obj = JSON.parse(msg.data);

          const jsonData2 = this.jsonData;

          const parms = obj.params;
 console.log(obj)
          if(parms){
          // 如果鼠标不在输入框内，更新输入框的值
          // this.submitDataToBackend()
          const parms = obj.params;
          // const xiaoche = obj.params[3];

          // console.log(parms);

if(obj.params){

         
          
      
          for (let i = 0; i < jsonData2.length; i++) {
            let arr = jsonData2[i];
            for (let j = 0; j < arr.length; j++) {

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

@@ -5,8 +5,8 @@
      }}</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/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')


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

@@ -5,8 +5,8 @@
      }}</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/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')

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

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

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

@@ -15,13 +15,13 @@
        active-class="blue-button"
        >{{ $t("State") }}</router-link
      >
      <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

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

@@ -5,8 +5,8 @@
      }}</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/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')

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

@@ -5,8 +5,8 @@
        }}</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/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')
@@ -215,6 +215,10 @@
submitDataToBackend(currentButtonName) {
  const data = [];
  let jsonObject;
  if (currentButtonName === '故障' || currentButtonName === 'Fault') {
    return false;

  }

  if (currentButtonName === 'A01半自动启动' || currentButtonName === 'A01 Semi-Auto Start') {
    const values = [this.jsonData[0][10].button.value];
@@ -428,7 +432,7 @@
  }

  let obj = JSON.parse(msg.data);
  // console.log(obj)
// console.log(obj)
const weihuiling=obj.weihuiling;
  const jsonData2 = this.jsonData;


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

@@ -5,8 +5,8 @@
      }}</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/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')

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

@@ -7,8 +7,8 @@
      }}</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/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')


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

@@ -7,8 +7,8 @@
      }}</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/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')


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

@@ -5,7 +5,7 @@

      <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/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('Parameter')

 CanadaMes-ui/src/views/home/index.vue

@@ -878,6 +878,7 @@
                    if(this.alarm.length>0){

                        this.dialogFormVisible2=true;

                    }

                    console.log(obj.countdown[0],this.CountDowns);

                    //复位倒计时

                    if (obj.countdown[0] == true&&this.CountDowns==0) {

                        this.CountDown();

@@ -1717,6 +1718,7 @@
            });

        },

        CountDown(){

            this.dialogFormCountDown=true;

            //50秒倒数计时

            let count = 45;

            let timer = setInterval(


 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

File was deleted

 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -17,25 +17,25 @@
        //
        System.out.println("启动完成");

 new PlcHold().start();
     // new PlcHold().start();

        new Plchome().start();

//         new Plcalarm().start();
         new Plcalarm().start();

//         new Plcsign().start();
         new Plcsign().start();

//         new Plcaction().start();
//         new Plcstate().start();
//         new PlcPositioning1().start();
        
         new Plcstate().start();
         new PlcPositioning1().start();

//         new PlcParameter2().start();
         new PlcParameter2().start();

//         new PLCAutomaticParameterSetting().start();
         new PLCAutomaticParameterSetting().start();

//         new PlcManualonePosition().start();
//         new PlcManualonePosition2().start();
//         new PlcServoManualone().start();
//         new PLCManualJog().start();
         new PlcManualonePosition().start();
         new PlcManualonePosition2().start();
         new PlcServoManualone().start();
         new PLCManualJog().start();
    }
}

 springboot-vue3/src/main/resources/config.properties

@@ -54,8 +54,6 @@










#Parameter2--------------------------



#id