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

wu

2023-11-30 0ece3ba8c92df0438af52b8de6b9225d8ada4103

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

@@ -30,8 +30,8 @@
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
      }}</router-link>
      <router-link to="/Electrical/Manualoneposition" tag="el-button" type="text" active-class="blue-button">{{
        $t('Manualoneposition')
      <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition')
      }}</router-link>
      <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition2')
@@ -44,7 +44,7 @@
      }}</router-link>
    </el-breadcrumb>

    <el-row :gutter="18">
    <el-row :gutter="18" class='card'>
      <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block">
          <div class="button-row" style="display: flex; justify-content: space-between;">
@@ -56,8 +56,7 @@
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
              <el-button v-if="item.type === '0'" v-model="item.value" class="input-box"
                @click="submitDataToBackend();">取地址</el-button>
              <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">取地址</el-button>
            </div>
          </div>

@@ -67,8 +66,9 @@
    <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->
  </div>
</template>
  

<script>
let socket;
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/Positioning2'

@@ -80,6 +80,11 @@
      jsonData: data // 加载整个data.json文件作为jsonData
    }
  },
  created () {
    this.initWebSocket();
    // console.log('jsonData:', this.jsonData); 

  },
  methods: {
    updateButtonValue (dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
@@ -88,22 +93,112 @@
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '0') {
            return { name: item.name, value: item.value, address: item.address };
            return { value: parseInt(item.value) };
          } else if (item.button) {
            return { name: item.title.name, value: item.title.value, address: item.title.address };
            return { value: parseInt(item.title.value) };
          }
          return null;
        });
      });

      // 模拟提交数据到后端的操作，实际情况下需要根据你的后端API进行修改
      console.log('提交以下数据到后端:', inputData);
      // 将inputData转换为整数数组
      const integerArray = inputData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item !== null) {
            return item.value;
          }
          return null;
        });
      });
      // 构建JSON对象
      const jsonObject = { data: integerArray };

    }
      // 提交数据到后端
      const jsonString = JSON.stringify(jsonObject);
      // console.log('提交以下数据到后端:', jsonString);
      socket?.send(jsonString);
    },
    initWebSocket () {

      let viewname = "Positioning2";

      if (typeof WebSocket === "undefined") {
        console.log("您的浏览器不支持WebSocket");
      } else {
        let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;

        if (socket != null) {
          socket.close();
          socket = null;
        }

        // 开启一个websocket服务
        socket = new WebSocket(socketUrl);

        // 打开事件
        socket.onopen = function () {
          console.log("websocket已打开");
        };

        // 收到消息
        socket.onmessage = (msg) => {
          if (!msg.data) {
            return; // 如果收到空数据，则直接返回，不执行后续逻辑
          }

          let obj = JSON.parse(msg.data);
          const jsonData2 = this.jsonData;
          document.addEventListener('mouseover', function (event) {
            const inputBox = document.querySelectorAll('.el-card__body');
            const target = event.target;
            if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
              // 如果鼠标不在输入框内，更新输入框的值
              // this.submitDataToBackend()
              const parms = obj.params;

              console.log(parms)
              let index = 0;
              for (let i = 0; i < jsonData2.length; i++) {
                let arr = jsonData2[i];
                for (let j = 0; j < arr.length; j++) {
                  let obj = arr[j];
                  if (obj.type === '0' && Object.prototype.hasOwnProperty.call(obj, 'value')) {
                    obj.value = parms[0][index];
                    index++;
                  }
                }
              }
              // console.log(jsonData2);

            }
          });
        };




        // 关闭事件
        socket.onclose = function () {
          console.log("websocket已关闭");
        };

        // 发生错误事件
        socket.onerror = function () {
          console.log("websocket发生了错误");
        };

      }
    },
    send () {


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

  }
}
</script>
  

<style scoped>
.item-row {
  display: flex;