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

wu

2023-12-01 482c178f89c516440628acb70b2f050747f00449

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

@@ -12,26 +12,26 @@
      }}</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('ServoManual')

      }}</router-link>

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

        }}</router-link>

    </el-breadcrumb>



    <div>Parameter</div>



    <el-form label-width="100px" style="display: flex; flex-wrap: wrap;" :model="messagepack.data">

      <div id="btn_div">

        <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')

        }}</el-button>

        <!-- <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')

        }}</el-button> -->



      </div>

      <div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">

      <div class="kuai_div" v-for="(item, index) in jsonData" :key="index">

        <el-input style="width: 280px; border:none;" class="in_mc" v-model="item.name" readonly></el-input>



        <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>

        <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>

        <input type="number" style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">

        <span style="margin-right: 5px; width: 50px;">{{ item.unit }}</span>

        <!-- <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span> -->

        <!-- <span style="margin-right: 5px; font-size: 14px;color: red;">|</span> -->

        <el-input v-model="item.value" type="number"

          style="width: 143px; margin-right: 5px; margin-top: 5px; font-size: 16px;border:none"  class="input-box"

                @keyup.enter.native="send"></el-input>

        <span style="margin-right: 5px; width: 50px;"  >{{ item.unit }}</span>



      </div>

    </el-form>

@@ -47,22 +47,18 @@
let socket;

import LanguageMixin from '../../lang/LanguageMixin'

import data from '../../configuration/Parameter'

import { throttle } from 'lodash';

export default {

  name: "Parameter",

  mixins: [LanguageMixin],

  data () {

    return {

      jsonData: data,

    
      dialogVisible: true,

      password: '',

      activeButton: '',

      record: {

        params: [100, 200, 10, 10, 10, 10],

        xyData: [



        ],

        canshu: []

      },

     
      messagepack: {

        data: { taskname: "" }

      },

@@ -78,9 +74,12 @@
    this.initWebSocket();

    this.isButtonDisabled = true;





  },

  methods: {

    showdata () {

      


    },





    setActiveButton (buttonName) {

@@ -114,41 +113,39 @@
          }



          let obj = JSON.parse(msg.data);





          //  console.log(obj);

           const jsonData2=this.jsonData;

          //  console.log(jsonData2);

          const handleMouseMove = throttle(function (event) {

            const inputBox = document.querySelectorAll('.input-box');

            const target = event.target;

            if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {

          if (obj.params && obj.state) {





            this.record.params[0] = obj.params[0];

            this.record.state = obj.state[0];

            
            if (obj.state && obj.state.length > 0) {

              let isButtonDisabled = this.record.state.includes(1);

              this.isButtonDisabled = isButtonDisabled;



// console.log( Array.isArray(jsonData2));

         
             
// 将 obj 中的 params 值更新到 jsonData 中的 value 中

for (let i = 0; i < obj.params[0].length; i++) {

  jsonData2[i].value = obj.params[0][i];

}





              this.record.xyData = this.jsonData.para;



              for (let a = 0; a < this.record.xyData.length; a++) {

                this.record.xyData[a].value = this.record.params[0][a];



              }



              this.record.xyData = this.jsonData.para.filter(item => {

                return item.state != 0;

              }



              );

              const language = this.$i18n.locale;

              if (language === 'en-US') {

                this.replaceChineseWithEnglish();

              } else {

                this.localizedRoles = [...this.record.xyData];

              }

          
            
            }

          }

          this.$forceUpdate();

          this.replaceChineseWithEnglish();

        };

          // this.$forceUpdate();

          // this.replaceChineseWithEnglish();

        }

      }, 200);



document.addEventListener('mouseover', handleMouseMove);

  
};



        // 关闭事件

        socket.onclose = function () {

@@ -162,8 +159,8 @@
      }

    },

    send () {

      this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value2)); // 转换为整数数组

      //console.log(this.messagepack);

      this.messagepack.data = this.jsonData.map((item) => parseInt(item.value)); // 转换为整数数组

     console.log(this.messagepack);

      socket?.send(JSON.stringify(this.messagepack));

    },

    handleChange (index, value) {

@@ -172,7 +169,7 @@
    //语言转换

    replaceChineseWithEnglish () {

      const translation = this.$t('langparameter');

      this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });

      this.jsonData.para = this.jsonData.para.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });

      //console.log(translation);

    },

  }

@@ -189,8 +186,10 @@
  border: 1px solid black;

  border: none;

}

.special-class{



.special-class {}



}



.in_mc {