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

clll

2023-11-27 1de312a18d164c2fa3718a1a975b8c5804723bcf

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

@@ -13,19 +13,16 @@
      }}</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('Servo Manual')

        }}</router-link>

    </el-breadcrumb>

    <div>{{ $t('State') }}</div>





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



      <div class="kuai_div" v-for="item in this.record.xyData" :key="item.name">

        <el-input style="width: 60%;" class="in_mc" v-model="item.name" readonly></el-input>

        <el-input v-model="item.value" readonly="readonly" style="width: 90px;"></el-input>

      </div>







    </el-form>



@@ -37,12 +34,14 @@


<script >

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

import data from '../../configuration/State'

let socket;

export default {

  name: "State",

  mixins: [LanguageMixin],

  data () {

    return {

      jsonData: data,

      activeButton: '',

      record: {

        params: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1,],

@@ -111,11 +110,9 @@
          this.record.params[0] = obj.sta[0];

          //将读取到的PLC的数据，与定义的xyData，组合成新的数组

          for (let a = 0; a < this.record.params[0].length; a++) {

            if (!this.record.xyData[a]) {

              this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };

            } else {

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

            }



            this.record.xyData[a].name = this.jsonData.state[a].name;

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



          }

          const language = this.$i18n.locale;

@@ -124,8 +121,8 @@
          } else {

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

          }

          //console.log(this.localizedRoles);

          this.$forceUpdate();

          this.replaceChineseWithEnglish();



        }.bind(this);

        //关闭事件

@@ -141,8 +138,9 @@
    //语言转换

    replaceChineseWithEnglish () {

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

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

      console.log(translation);

      const translation1 = this.$t('Statelang');

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

      //console.log(translation);

    },





@@ -167,6 +165,7 @@
  margin-bottom: 15px;

}





.el-input {

  border: none;