From 376f9a04e2c2814d210e2c5177f0e27d115e1b5d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 23 二月 2024 09:46:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 420 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 314 insertions(+), 106 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 80affab..302a3d5 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -1,49 +1,40 @@
<template>
<div class="app">
- <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> -->
+ <!-- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+
<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')
+ $t('Parameter')
}}</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>
- <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>
- <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>
- <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('AutomaticParameterSetting')
+ <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">{{
$t('ManualJog')
}}</router-link>
- </el-breadcrumb>
+
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</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/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-row :gutter="20">
<el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
@@ -51,18 +42,37 @@
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
<span class="name" style="width:300px;">{{ item.name }}</span>
- <el-input style="width:250px;" v-if="item.state != 0 && item.type === '0'" v-model="item.value"
+
+
+ <el-input style="width:250px;" v-if="item.state != 0 && item.type === '0' && groupIndex === 0 && (itemIndex === 2)" readonly v-model="item.value"
+ class="input-box" :oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`"></el-input>
+
+
+ <el-input style="width:250px;" v-else-if="item.state != 0 && item.type === '0' && groupIndex === 1 && (itemIndex === 2)" readonly v-model="item.value"
+ class="input-box" :oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`"></el-input>
+
+ <el-input style="width:250px;" v-else-if="item.state != 0 && item.type === '0' && groupIndex === 0 " v-model="item.value" @keyup.enter.native="A01start($event)"
+ class="input-box" :oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`"></el-input>
+
+
+ <el-input style="width:250px;" v-else-if="item.state != 0 && item.type === '0' && groupIndex === 1 " v-model="item.value" @keyup.enter.native="A02start($event)"
+ class="input-box" :oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`"></el-input>
+
+
+
+
+ <el-input style="width:250px;" v-else-if="item.state != 0 && item.type === '0'" v-model="item.value"
class="input-box"></el-input>
</div>
</div>
<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 && language === 'en-US'" :name="item.button.name" v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 0,'greenbutton': item.button.name !== 'NotZero' && item.button.name !== 'Fault' && item.button.value === 1 }"
+ :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 0,'error-button3': item.button.name === 'Zero' && item.button.value ===1,'greenbutton': item.button.name !== 'NotZero' && item.button.name !== 'Fault' && item.button.value === 1 }"
@click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
item.button.name }}</el-button>
<el-button v-if="item.button && language === 'zh-CN'" :name="item.button.name" v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1, 'error-button2': item.button.name === '鏈洖闆�' && item.button.value === 0,'greenbutton': item.button.name !== '鏈洖闆�' && item.button.name !== '鏁呴殰' && item.button.value === 1 }"
+ :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1, 'error-button2': item.button.name === '鏈洖闆�' && item.button.value === 0,'error-button3': item.button.name === '宸插洖闆�' && item.button.value === 1,'greenbutton': item.button.name !== '鏈洖闆�' && item.button.name !== '鏁呴殰' && item.button.value === 1 }"
@click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
item.button.name }}</el-button>
</div>
@@ -77,7 +87,7 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/Manualoneposition2'
-import { throttle } from 'lodash';
+
let socket;
export default {
name: "ManualonePosition2",
@@ -121,75 +131,143 @@
},
+
+
+ A01start(event){
+ const data = [];
+
+for (let i = 0; i < 1; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
+ return { value: item.value };
+ });
+
+ const values = inputData.map(item => item.value);
+
+ data.push(values);
+}
+data.push([], [], [],[]);
+
+
+
+const jsonObject = { data };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
+event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
+
+ },
+ A02start(event){
+
+ const data = [];
+
+for (let i = 1; i < 2; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
+ return { value: item.value };
+ });
+
+ const values = inputData.map(item => item.value);
+ data.unshift([]);
+ data.push(values);
+}
+data.push([], [], []);
+
+
+const jsonObject = { data };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
+event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
+ },
+ //鎻愪氦鏂规硶
submitDataToBackend (currentButtonName) {
if (currentButtonName === 'A01缈昏浆鍚姩' || currentButtonName === 'A01 SERVE TURN') {
const data = [];
- for (let i = 0; i < 1; i++) {
- const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
- return { value: item.value };
- });
+const values = [this.jsonData[0][3].button.value]
- const values = inputData.map(item => item.value);
-
- data.push(values);
- }
- data.push([], [], [],[]);
+ data.push(values);
+
+ data.unshift([], [], [],[],[]);
- const jsonObject = { data };
+ const jsonObject = { data };
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString = JSON.stringify(jsonObject);
- console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
- socket?.send(jsonString);
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString = JSON.stringify(jsonObject);
+ console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+ socket?.send(jsonString);
+ // setTimeout(() => {
+ // const reversedData = data.map(values => values.map(value => {
+ // return (!value || value === 1) ? 0 : 0 ;
+ // }));
+
+ // const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ // const reversedJsonString = JSON.stringify(reversedJsonObject);
+ // console.log('鍙嶈浆鍚�:', reversedJsonString);
+ // socket?.send(reversedJsonString);
+ // }, 1000);
}
if (currentButtonName === 'A02缈昏浆鍚姩' || currentButtonName === 'A02 SERVE TURN') {
const data = [];
- for (let i = 1; i < 2; i++) {
- const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
- return { value: item.value };
- });
+const values = [this.jsonData[0][3].button.value]
- const values = inputData.map(item => item.value);
- data.unshift([]);
- data.push(values);
- }
- data.push([], [], []);
+ data.push(values);
+
+ data.unshift([], [], [],[],[],[]);
- const jsonObject = { data };
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString = JSON.stringify(jsonObject);
- console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
- socket?.send(jsonString);
+ const jsonObject = { data };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString = JSON.stringify(jsonObject);
+ console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+ socket?.send(jsonString);
+ // setTimeout(() => {
+ // const reversedData = data.map(values => values.map(value => {
+ // return (!value || value === 1) ? 0 : 0 ;
+ // }));
+
+ // const reversedJsonObject = { data: reversedData };
+
+ // // 鎻愪氦鏁版嵁鍒板悗绔�
+ // const reversedJsonString = JSON.stringify(reversedJsonObject);
+ // console.log('鍙嶈浆鍚�:', reversedJsonString);
+ // socket?.send(reversedJsonString);
+ // }, 1000);
}
if (currentButtonName === '鏁呴殰' || currentButtonName === 'Fault') {
+ return false;
- const data2 = [];
- const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && ['鏁呴殰', 'Fault'].includes(subItem.button.name));
+ // const data2 = [];
+ // const resetButtonValues = this.jsonData.map(item => {
+ // const buttonItem = item.find(subItem => subItem.button && ['鏁呴殰', 'Fault'].includes(subItem.button.name));
- return buttonItem ? buttonItem.button.value : null;
- }).filter(value => value !== null);
+ // return buttonItem ? buttonItem.button.value : null;
+ // }).filter(value => value !== null);
- // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
- data2.push(...resetButtonValues);
- data2.unshift([], []);
- const jsonObject2 = { data2 };
- data2.push([], []);
+ // // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ // data2.push(...resetButtonValues);
+ // data2.unshift([], []);
+ // const jsonObject2 = { data2 };
+ // data2.push([], []);
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString2 = JSON.stringify(jsonObject2);
- console.log('鎵�鏈夋晠闅滅殑value:', jsonString2);
- socket?.send(jsonString2);
+ // // 鎻愪氦鏁版嵁鍒板悗绔�
+ // const jsonString2 = JSON.stringify(jsonObject2);
+ // console.log('鎵�鏈夋晠闅滅殑value:', jsonString2);
+ // socket?.send(jsonString2);
}
@@ -213,15 +291,27 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
socket?.send(jsonString2);
+ setTimeout(() => {
+ const reversedData = data2.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
- if (currentButtonName === '鍥為浂' || currentButtonName === 'Zero') {
+ if (currentButtonName === '鍥為浂' || currentButtonName === 'Home') {
const data2 = [];
const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && ['鍥為浂', 'Zero'].includes(subItem.button.name));
+ const buttonItem = item.find(subItem => subItem.button && ['鍥為浂', 'Home'].includes(subItem.button.name));
return buttonItem ? buttonItem.button.value : null;
}).filter(value => value !== null);
@@ -234,6 +324,18 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
socket?.send(jsonString2);
+ setTimeout(() => {
+ const reversedData = data2.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -265,19 +367,37 @@
};
// 鏀跺埌娑堟伅
- socket.onmessage = (msg) => {
- if (!msg.data) {
- return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
- }
+// let isMouseInInputBox = false; // 鏍囪榧犳爣鏄惁鍦ㄨ緭鍏ユ鍐�
+
+// const inputBox = document.querySelectorAll('.input-box');
+// inputBox.forEach(box => {
+// box.addEventListener('mouseenter', () => {
+// isMouseInInputBox = true;
+// });
+// box.addEventListener('mouseleave', () => {
+// isMouseInInputBox = false;
+// });
+// });
+
+socket.onmessage = (msg) => {
+ if (!msg.data) {
+ return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+ }
+
+ if (document.activeElement.tagName.toLowerCase() === 'input') {
+ return;
+ }
+
let obj = JSON.parse(msg.data);
// console.log(obj)
const jsonData2 = this.jsonData;
const weihuiling = obj.weihuiling;
- const handleMouseMove = throttle(function (event) {
- const inputBox = document.querySelectorAll('.el-card__body');
- const target = event.target;
- if (obj.zuhe1 && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+
+
+
+
+ if (obj.zuhe1 ) {
// 鎵ц鏇存柊閫昏緫
for (let i = 0; i < 2; i++) {
jsonData2[i].forEach((item, index) => {
@@ -304,8 +424,25 @@
});
});
- // 閬嶅巻guzhang鏁扮粍
- for (let i = 0; i < jsonData2.length; i++) {
+
+
+
+
+
+ }
+
+
+
+
+
+
+ if(obj.zuhe1){
+
+
+
+
+ // 閬嶅巻guzhang鏁扮粍
+ for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
let obj2 = arr[j];
@@ -320,13 +457,13 @@
-
+//鏈洖闆�
for (let i = 0; i < jsonData2.length; i++) {
let arr2 = jsonData2[i];
for (let j = 0; j < arr2.length; j++) {
let obj3 = arr2[j];
if (obj3.button) {
- if (obj3.button && (obj3.button.name === "鏈洖闆�" || obj3.button.name === "NotZero")) {
+ if (obj3.button && (obj3.button.name === "鏈洖闆�" || obj3.button.name === "NotZero" || obj3.button.name === "宸插洖闆�" || obj3.button.name === "Zero")) {
obj3.button.value = weihuiling[0][i];
// console.log(obj3.button.value)
}
@@ -339,26 +476,91 @@
}
//鍚姩
- for (let i = 0; i < jsonData2.length; i++) {
- let arr4 = jsonData2[i];
- for (let j = 0; j < arr4.length; j++) {
- let obj4 = arr4[j];
- if (obj4.button && (obj4.button.name.includes("鍚姩") || obj4.button.name.includes("Start"))) {
- obj4.button.value = obj.qidong[0][i];
- // console.log(obj2.button.value)
- }
- }
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("鍚姩") || obj4.button.name.includes("Start"))) {
+ // obj4.button.value = obj.qidong[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
- }
+ // }
+
+
+
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("鍚姩") || obj4.button.name.includes("Start"))) {
+ // obj4.button.value = obj.qidong[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+
+
+ // }
+
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("澶嶄綅") || obj4.button.name.includes("Reast"))) {
+ // obj4.button.value = obj.fuwei[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+
+
+ // }
+
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("鍥為浂") || obj4.button.name.includes("Home"))) {
+ // obj4.button.value = obj.huiling[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+
+
+ // }
- }
- }, 50);
+ //鏀瑰彉鏈洖闆舵枃瀛�
+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.button && obj.button.value===1) {
+ if ( obj.button.name==="鏈洖闆�" && this.language==="zh-CN") {
+ obj.button.name =obj.button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ }
+ if ( obj.button.name==="NotZero") {
+ obj.button.name =obj.button.name.replace("NotZero","Zero") ;
+ }
+ }
+ if (obj.button && obj.button.value===0) {
+ if ( obj.button.name==="宸插洖闆�"&& this.language==="zh-CN") {
+ obj.button.name =obj.button.name.replace("宸插洖闆�","鏈洖闆�") ;
+ }
+ if ( obj.button.name==="Zero") {
+ obj.button.name =obj.button.name.replace("Zero","NotZero") ;
+ }
+ }
- document.addEventListener('mouseover', handleMouseMove);
+
+}
+}
+
+}
+
};
@@ -443,4 +645,10 @@
background-color: green;
}
+
+.error-button3{
+ background-color: green;
+
+
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0