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

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

  },

  created () {

    this.init();

    
    //this.showdata();

  },

  activated(){

    this.init();



 },

  methods: {

    showdata () {

      console.log(1111);

@@ -95,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;

@@ -114,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];