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

ZengTao

2024-05-10 e808f9e89ad6bd5d252e1aad42daa676b481b0ca

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

@@ -1,22 +1,19 @@
<template>
  <div class="app">
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
    <!-- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
      }}</router-link>
      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
      }}</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/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('Parameter')
      }}</router-link>
    </el-breadcrumb>
    </el-breadcrumb> -->

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
    <!-- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Automatic State')
      }}</router-link>
      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
@@ -30,41 +27,45 @@
<router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
        $t('Servomanualone')
      }}</router-link>
      <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
      }}</router-link>
     
     
      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
        $t('Address parameter settings')
      }}</router-link>
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
      }}</router-link>
     
      <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition2')
      }}</router-link>
      <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
        $t('Speed parameter settings')
      }}</router-link>
      
    </el-breadcrumb>
    </el-breadcrumb> -->

    <el-row :gutter="40" style="width:100%;">
      <el-col :span="18" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block" style="width:100%;">
    <el-row :gutter="40">
  <el-col :span="26" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
    <el-card class="json-block" style="width:100%;">
      <!-- 使用容器显示文字 -->
      <div style="position: relative;">
        <div class="extra-data" style="margin-top: 2px; display: flex;">
  <div v-for="(extraItem, extraIndex) in extraData[groupIndex]" :key="extraIndex" >
    {{ extraItem }}
  </div>
</div>

          <div class="button-row" style="display: flex; justify-content: flex-start;flex-wrap:wrap;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" style="margin: 10px;">
              <el-button v-if="item.button" :name="item.button.name"
 :class="{ 'dow': false, 'op': item.button.value === 1 }" class="action-button"
 @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{
 item.button.name
 }}</el-button>
            </div>


        <div class="button-row" style="display: flex; justify-content: flex-start; flex-wrap: wrap;">
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" style="margin: 10px;">
            <el-button v-if="item.button" v-model="item.button.value" :name="item.button.name" style='width:130px;'
              :class="{ 'dow': item.button.value === 0, 'op': item.button.value === 1 }" class="action-button"
              @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">
              {{ item.button.name }}
            </el-button>
          </div>
        </el-card>
      </el-col>
    </el-row>
        </div>
      </div>
    </el-card>
  </el-col>
</el-row>

    <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->
  </div>
</template>
@@ -72,16 +73,27 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/ManualJog'
import {SelectPassword} from "../../api/home";
let socket;
export default {
  name: "ManualJog",
  mixins: [LanguageMixin],
  data () {
    return {
      jsonData: data // 加载整个data.json文件作为jsonData
      jsonData: data, // 加载整个data.json文件作为jsonData
      password: 1,
      extraData: [
      "Infeed/Outfeed Conveyos",
      "A01",
      "A02",
      "B01",
      "B02",
    
    ]
    }
  },
  activated () {


    this.initWebSocket();
    const language = this.$i18n.locale;
@@ -89,9 +101,10 @@
    if (language === 'en-US') {
      this.replaceChineseWithEnglish();
    }
    this.$forceUpdate();


   
this.load();
          
  },
  methods: {
    closeSocket () {
@@ -99,45 +112,54 @@
      socket.close();
    },
    updateButtonValue (dataGroup, itemIndex) {
      if (dataGroup[itemIndex].button.value === 1) {
      if (dataGroup[itemIndex].button.value2 === 0) {
    // 如果当前按钮的值是 0，将其设为 1
    this.$set(dataGroup[itemIndex].button, 'value', 0);
    this.$set(dataGroup[itemIndex].button, 'value2', 1);
  } else {
    // 否则将其设为 0
    this.$set(dataGroup[itemIndex].button, 'value', 1);
    this.$set(dataGroup[itemIndex].button, 'value2', 0);
  }
    },
    submitDataToBackend () {
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '3') {
            return { value: item.button.value };
          }
          return null;
        });
      });
    load(){

      const values = inputData.flat().filter(item => item !== null).map(item => item.value);
      SelectPassword().then(res => {
                this.password = res.data.password;
                console.log(this.password)
            });

      const jsonObject = { data: values };

      // 提交数据到后端
      const jsonString = JSON.stringify(jsonObject);
      console.log('Type为3的value:', jsonString);
      socket?.send(jsonString);



console.log(this.jsonData)

            

    },
    //根据读取PLC的值，根据名称改变颜色1打开，0关闭
//     getStatusClass (zhuangtai) {
// // console.log(zhuangtai);
//       if (zhuangtai === 1) {
//         return "op";
//       }
//       else {
//         return "dow";
//       }
    submitDataToBackend () {

//     },

          // 密码正确，继续提交数据到后端
          const inputData = this.jsonData.map(dataGroup => {
            return dataGroup.map(item => {
              if (item.type === '3') {
                return { value: item.button.value2 };
              }
              return null;
            });
          });

          const values = inputData.flat().filter(item => item !== null).map(item => item.value);

          const jsonObject = { data: values };

          // 提交数据到后端
          const jsonString = JSON.stringify(jsonObject);
          console.log('Type为3的value:', jsonString);
          socket?.send(jsonString);

    },

    initWebSocket () {
      let viewname = "ManualJog";

@@ -158,7 +180,7 @@
        socket.onopen = function () {
          console.log("websocket已打开");
        };

       let isUpdated = false;  // 定义标志变量
        // 收到消息
        socket.onmessage = (msg) => {
          if (!msg.data) {
@@ -168,31 +190,58 @@
          let obj = JSON.parse(msg.data);

          const jsonData2 = this.jsonData;

          const parms = obj.params;
// console.log(obj)
//console.log(this.jsonData)
          if(parms){
          // 如果鼠标不在输入框内，更新输入框的值
          // this.submitDataToBackend()
          const parms = obj.params;
          // const xiaoche = obj.params[3];
         
          
      
        
          let index = 0;
    for (let i = 0; i < jsonData2.length ; i++) {
      let arr = jsonData2[i];

          // console.log(parms);

if(obj.params){

          for (let i = 0; i < jsonData2.length; i++) {
            let arr = jsonData2[i];
            for (let j = 0; j < arr.length; j++) {
              let obj = arr[j];
              obj.button.value = parms[0][j];

            }

      for (let j = 0; j < arr.length; j++) {
        let obj = arr[j];
       
          if ( parms[0][index] !== undefined) {
            obj.button.value = parms[0][index];
            index++;
          }
        
      }
    }

          

       console.log(this.jsonData)


          if (!isUpdated) {
      for (let i = 0; i < this.jsonData.length; i++) {
        for (let j = 0; j < this.jsonData[i].length; j++) {
          this.jsonData[i][j].button.value2 = this.jsonData[i][j].button.value;
        }
      }
      isUpdated = true;  // 更新标志变量的值
    }



        }



        };

    

  


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