From ea46f28356e2acb3bc7cc69b9af3c52fab38c0b0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 16:56:47 +0800
Subject: [PATCH] 终止任务功能测试
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 161 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 125 insertions(+), 36 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index fee9ef8..db1e2fe 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -43,10 +43,24 @@
<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' && groupIndex === 0" v-model="item.value" @keyup.enter.native="A01start"
- class="input-box"></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"
- class="input-box"></el-input>
+
+ <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>
@@ -54,11 +68,11 @@
<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>
@@ -73,7 +87,7 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/Manualoneposition2'
-import { throttle } from 'lodash';
+
let socket;
export default {
name: "ManualonePosition2",
@@ -119,7 +133,7 @@
},
- A01start(){
+ A01start(event){
const data = [];
for (let i = 0; i < 1; i++) {
@@ -141,10 +155,10 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
-
+event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
},
- A02start(){
+ A02start(event){
const data = [];
@@ -166,6 +180,7 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
+event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
},
//鎻愪氦鏂规硶
submitDataToBackend (currentButtonName) {
@@ -186,6 +201,18 @@
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);
}
@@ -206,28 +233,41 @@
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);
}
@@ -251,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);
@@ -272,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);
}
@@ -303,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) => {
@@ -348,9 +430,10 @@
}
- }, 50);
+
- document.addEventListener('mouseover', handleMouseMove);
+
+
if(obj.zuhe1){
@@ -518,4 +601,10 @@
background-color: green;
}
+
+.error-button3{
+ background-color: green;
+
+
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0