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

wu

2023-12-06 afbddf62e45bce6fd9428cddec36382c75cee53a

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

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

        }}</router-link>



    </el-breadcrumb>

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

    <div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">

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

        <el-col class="deng" :class="getStatusClass(item.value)"></el-col>

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

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



      </div>



@@ -58,9 +59,13 @@
    }

  },

  created () {

    this.init();

    
    //this.showdata();

  },

  activated(){

    this.init();



 },

  methods: {

    showdata () {

      console.log(1111);

@@ -94,7 +99,7 @@
      } else {

        //console.log("您的浏览器支持WebSocket");



        let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;

        let socketUrl = "ws://" + this.$t('ip')+":8888" + "/springboot-vue3/api/talk/" + viewname;

        if (socket != null) {

          socket.close();

          socket = null;

@@ -113,7 +118,7 @@
          this.record.params[0] = obj.sig[0];



          this.record.xyData = this.jsonData.sign;



          console.log(this.jsonData.sign)

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

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



@@ -148,10 +153,14 @@
    },

    //语言转换

    replaceChineseWithEnglish () {



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



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

      //console.log(translation);

      if (translation != null) {

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

        //console.log(translation);

      }



    }

  }



@@ -186,7 +195,7 @@


.kuai_sb {

  text-align: center;

  width: 25%;

  width: 15%;

  margin-bottom: 15px;

}



@@ -211,8 +220,8 @@
  background: #A0A0A0;

  border: 0.1875em solid white;

  border-radius: 50%;

  height: 5em;

  width: 5em;

  height: 4em;

  width: 4em;

  box-shadow: 0.375em 0.375em 0 0 rgba(214, 214, 214, 0.125);

}