From 46f29e79b43be98199d0727a71d85dddaa6e1fd4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 15 十二月 2023 10:00:23 +0800
Subject: [PATCH] 增加A01 A02行走伺服回零 输入密码才能点击
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 62 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 5186048..c2db6ea 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -87,7 +87,7 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/Manualoneposition2'
-import { throttle } from 'lodash';
+
let socket;
export default {
name: "ManualonePosition2",
@@ -224,24 +224,25 @@
}
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);
}
@@ -323,13 +324,26 @@
}
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))) {
+ const handleMouseMove = (event) => {
+ if (!event || !event.target) {
+ return; // 濡傛灉 event 鎴� event.target 涓嶅瓨鍦紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+ }
+
+ const inputBox = document.querySelectorAll('.input-box');
+ const target = event.target;
+ // console.log(obj);
+
+ const isMouseInInput = Array.from(inputBox).some(box => box.contains(target));
+
+
+if (!isMouseInInput) {
+
+ if (obj.zuhe1 ) {
// 鎵ц鏇存柊閫昏緫
for (let i = 0; i < 2; i++) {
jsonData2[i].forEach((item, index) => {
@@ -362,9 +376,15 @@
}
- }, 50);
+
- document.addEventListener('mouseover', handleMouseMove);
+ }
+
+ }
+ // console.log(jsonData2);
+ setInterval(() => handleMouseMove(event), 1000); // 姣忛殧 1000ms 妫�娴嬩竴娆￠紶鏍囦綅缃�
+
+document.addEventListener('mousemove', event => handleMouseMove(event));
if(obj.zuhe1){
--
Gitblit v1.8.0