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

wu

2023-12-01 482c178f89c516440628acb70b2f050747f00449

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

@@ -11,50 +11,40 @@
      }}</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('ServoManual')
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>

    </el-breadcrumb>

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
        $t('Servomanualone')
        <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/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
      }}</router-link>
      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning1')
          <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
      }}</router-link>
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
      }}</router-link>
    </el-breadcrumb>

    <el-row :gutter="26">
      <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block" style="width:auto;">
  <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex"  style="margin-bottom: -20px;">
    <el-card class="json-block"  style="width:auto;margin-bottom: 10px;">
          <el-row>
            <el-col v-for="(item, itemIndex) in dataGroup" :key="itemIndex" :span="12">
              <div class="item-container">
                <div class="item-row">
                  <span class="name" style='width:230px;'>{{ item.name }}</span>
                  <el-input v-if="item.type === '0'" v-model="item.value" class='input-box'
                    :class="{ 'special-class': groupIndex === 0, 'special-class2': groupIndex === 1 }"
                    v-show="groupIndex !== 0 && groupIndex !== 1"></el-input>
              <el-input v-if="item.type === '0'" v-model="item.value"   class='input-box' :class="{ 'special-class': groupIndex === 0,'special-class2': groupIndex === 1 }" v-show="groupIndex !== 0 && groupIndex !== 1"  ></el-input>
                </div>
              </div>
            </el-col>
          </el-row>
          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
              <el-button v-if="item.button" :name="item.button.name" v-model="item.button.value"
                :class="{ 'action-button': true, 'error-button': item.button.name === '故障' && item.button.value === 1 }"
                @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
                  item.button.name }}</el-button>
          <el-button v-if="item.button" :name="item.button.name" v-model="item.button.value" :class="{'action-button': true, 'error-button': item.button.name === '故障' && item.button.value === 1}" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button>

            </div>
          </div>
@@ -70,10 +60,12 @@
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/ServoManualone'
import { throttle } from 'lodash';

let socket;
export default {
  name: "ServoManualone",
  mixins: [LanguageMixin],
 
  data () {
    return {
      jsonData: data,
@@ -86,20 +78,26 @@
    // console.log('jsonData:', this.jsonData); 

  },
 
  methods: {
  
    
    updateButtonValue (dataGroup, itemIndex) {
      // 将当前按钮的值设为1

      this.$set(dataGroup[itemIndex].button, 'value', 1);



  // 将其他按钮的值设为0
  // dataGroup.forEach((item, index) => {
  //   if (index !== itemIndex && item.button) {
  //     this.$set(item.button, 'value', 0);
  //   }
  // });
    },
    submitDataToBackend (currentButtonName) {
      if (currentButtonName === '半自动启动') {
  if (currentButtonName === 'A01半自动启动') {
        const data = [];

        for (let i = 0; i < 2; i++) {
for (let i = 0; i < 1; i++) {
          const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
            return { value: item.value };
          });
@@ -108,7 +106,6 @@

          data.push(values);
        }



        const jsonObject = { data };
@@ -120,8 +117,30 @@

      }

      if (currentButtonName === '复位') {
  if (currentButtonName === 'A02半自动启动') {
    const data2 = [];

for (let i = 1; i < 2; i++) {
  const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
    return { value: item.value };
  });

  const values2 = inputData.map(item => item.value);

  data2.push(values2);

}
data2.unshift([]);
const jsonObject = { data:data2 };

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

  }

  if (currentButtonName === '复位') {
        const data2 = [];
        const resetButtonValues = this.jsonData.map(item => {
          const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '复位');
@@ -129,16 +148,47 @@
        }).filter(value => value !== null);

        // 将得到的值添加到 data 数组中
        data2.push(...resetButtonValues);
        const jsonObject2 = { data2 };
  data2.push(resetButtonValues.flat());

  // 在 data2 数组前面添加两个空数组
  data2.unshift([], []);

  // 创建 jsonObject2 对象，并添加 data2 属性
  const jsonObject2 = { data: data2 };

        // 提交数据到后端
        const jsonString2 = JSON.stringify(jsonObject2);
        console.log('所有Type为0的value:', jsonString2);
        socket?.send(jsonString2);


  window.location.reload();
      }

if (currentButtonName === '回零') {
  const data3 = [];
  const resetButtonValues3 = this.jsonData.map(item => {
    const buttonItem3 = item.find(subItem => subItem.button && subItem.button.name === '回零');
    return buttonItem3 ? buttonItem3.button.value : null;
  }).filter(value => value !== null);

  // 将得到的值添加到 data 数组中
  data3.push(resetButtonValues3.flat());

  // 在 data3 数组前面添加两个空数组
  data3.unshift([], [], []);

  // 创建 jsonObject2 对象，并添加 data3 属性
  const jsonObject3 = { data: data3 };

  // 提交数据到后端
  const jsonString3 = JSON.stringify(jsonObject3);
  console.log('回零:', jsonString3);
  socket?.send(jsonString3);
  window.location.reload();
}




      if (currentButtonName === 'A01半自动') {
        const elements = document.getElementsByClassName('special-class');
        for (let i = 0; i < elements.length; i++) {
@@ -230,11 +280,32 @@
                }
              }

for (let i = 0; i < obj.weihuiling[0].length; i++) {
  const weihuilingValue = obj.weihuiling[0][i];
  
  // 查找jsonData2中带有"button"的对象，并且name等于"故障"
  for (let j = 0; j < jsonData2.length; j++) {
    const section = jsonData2[j];
    
    for (let k = 0; k < section.length; k++) {
      const item = section[k];
      
      if (item.button && item.button.name === "未回零") {
        // 更新value属性
        item.button.value = weihuilingValue;
        break;
      }
    }
    
  
  }
}




            }
          }, 200);
}, 500);

          document.addEventListener('mouseover', handleMouseMove);
        };
@@ -265,11 +336,12 @@
</script>

<style scoped>


.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 2px;
  /* 调整每个项目之间的间距 */
  margin-bottom: 2px; /* 调整每个项目之间的间距 */
}

.action-button {
@@ -277,12 +349,12 @@
  background: #66b1ff;
  color: #FFF;
}

.blue-button {
  background-color: skyblue;
}

.error-button {
  background-color: red;
}


</style>