From 7f1806c6a01318f3b1eff38da7c7c41ae82ff8c0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 十二月 2023 13:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 135 +++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 71 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 9323ec7..2dae0ee 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -63,8 +63,8 @@
</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 && 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,'fuwei': item.button.name === 'Reset' && item.button.value === 1,'huiling': item.button.name === 'Home' && item.button.value === 1,'qidong': item.button.name === 'A01 Semi-Auto' && item.button.value === 1,'qidong2': item.button.name === 'A02 Semi-Auto' && item.button.value === 1,'qidong3': item.button.name === 'A01 Semi-Auto Start' && item.button.value === 1,'qidong4': item.button.name === 'A02 Semi-Auto Start' && item.button.value === 1,'qidong5': item.button.name === 'A02 Semi-Auto Start' && item.button.value === 1,'jiting': item.button.name === 'Abort/ResumeTasks' && 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,'fuwei': item.button.name === '澶嶄綅' && item.button.value === 1,'huiling': item.button.name === '鍥為浂' && item.button.value === 1,'qidong': item.button.name === 'A01鍗婅嚜鍔�' && item.button.value === 1,'qidong2': item.button.name === 'A02鍗婅嚜鍔�' && item.button.value === 1,'qidong3': item.button.name === 'A01鍗婅嚜鍔ㄥ惎鍔�' && item.button.value === 1,'qidong4': item.button.name === 'A02鍗婅嚜鍔ㄥ惎鍔�' && item.button.value === 1,'qidong5': item.button.name === 'A02鍗婅嚜鍔�' && item.button.value === 1,'jiting': 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 && 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,'error-button3': item.button.name === 'NotZero' && item.button.value === 1,'fuwei': item.button.name === 'Reset' && item.button.value === 1,'huiling': item.button.name === 'Home' && item.button.value === 1,'qidong': item.button.name === 'A01 Semi-Auto' && item.button.value === 1,'qidong2': item.button.name === 'A02 Semi-Auto' && item.button.value === 1,'qidong3': item.button.name === 'A01 Semi-Auto Start' && item.button.value === 1,'qidong4': item.button.name === 'A02 Semi-Auto Start' && item.button.value === 1,'qidong5': item.button.name === 'A02 Semi-Auto Start' && item.button.value === 1,'jiting': item.button.name === 'Abort/ResumeTasks' && 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-button3': item.button.name === '鏈洖闆�' && item.button.value === 1,'error-button2': item.button.name === '鏈洖闆�' && item.button.value === 0,'fuwei': item.button.name === '澶嶄綅' && item.button.value === 1,'huiling': item.button.name === '鍥為浂' && item.button.value === 1,'qidong': item.button.name === 'A01鍗婅嚜鍔�' && item.button.value === 1,'qidong2': item.button.name === 'A02鍗婅嚜鍔�' && item.button.value === 1,'qidong3': item.button.name === 'A01鍗婅嚜鍔ㄥ惎鍔�' && item.button.value === 1,'qidong4': item.button.name === 'A02鍗婅嚜鍔ㄥ惎鍔�' && item.button.value === 1,'qidong5': item.button.name === 'A02鍗婅嚜鍔�' && item.button.value === 1,'jiting': item.button.name === '鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨' && item.button.value === 1 }" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button>
</div>
</div>
</el-card>
@@ -157,7 +157,7 @@
data.push(values);
}
-data.push([],[], [],);
+data.push([], [],[]);
const jsonObject = { data };
@@ -185,7 +185,7 @@
}
data2.unshift([]);
-data2.push([], []);
+data2.push([], [],[]);
for (let i = 1; i < 2; i++) {
const inputData = this.jsonData[i].filter(item => item.type === '0' && item.read == 8888).map(item => {
@@ -195,7 +195,7 @@
const values2 = inputData.map(item => item.value);
data2.push(values2);
- data2.push([], [],[], []);
+ data2.push( [],[], []);
}
@@ -468,7 +468,7 @@
}
let obj = JSON.parse(msg.data);
- console.log(obj)
+ // console.log(obj)
const weihuiling=obj.weihuiling;
const jsonData2 = this.jsonData;
@@ -478,29 +478,10 @@
if (obj.zuhe1 && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
//鍚姩鎸夐挳
-
-
-
-
-
- jsonData2[0][9].button.value = obj.qidong[0][0]; // 绗竴涓瓙鏁扮粍涓涓�涓� type=66 鐨� button
-jsonData2[0][10].button.value = obj.qidong[0][1]; // 绗竴涓瓙鏁扮粍涓浜屼釜 type=66 鐨� button
-jsonData2[1][7].button.value = obj.qidong[0][2]; // 绗簩涓瓙鏁扮粍涓涓�涓� type=66 鐨� button
-jsonData2[1][8].button.value = obj.qidong[0][3];
-// 杈撳嚭鏇存柊鍚庣殑 jsonData2
-
-
-
-
-
-
-
-
-
// 鎵ц鏇存柊閫昏緫
for (let i = 0; i < 6; i++) {
@@ -511,8 +492,41 @@
});
}
+//杩涚墖id
+jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.read === 9999) {
+ subItem.value = obj.jinpianid[0];
+ }
+ });
+});
+//鍙栫墖id
+jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.read === 8888) {
+ subItem.value = obj.qupianid[0];
+ }
+ });
+});
-//鏁呴殰鏇存柊
+
+
+
+
+
+ }
+}, 50);
+
+ document.addEventListener('mouseover', handleMouseMove);
+
+
+
+
+ jsonData2[0][9].button.value = obj.qidong[0][0]; // 绗竴涓瓙鏁扮粍涓涓�涓� type=66 鐨� button
+jsonData2[0][10].button.value = obj.qidong[0][1]; // 绗竴涓瓙鏁扮粍涓浜屼釜 type=66 鐨� button
+jsonData2[1][7].button.value = obj.qidong[0][2]; // 绗簩涓瓙鏁扮粍涓涓�涓� type=66 鐨� button
+jsonData2[1][8].button.value = obj.qidong[0][3];
+ //鏁呴殰鏇存柊
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
@@ -542,11 +556,6 @@
}
-
-
-
-
-
//鏈洖闆舵洿鏂�
jsonData2[2][3].button.value = weihuiling[0][0];
@@ -554,53 +563,32 @@
jsonData2[4][4].button.value = weihuiling[0][2];
jsonData2[5][4].button.value = weihuiling[0][3];
-// for (let i = 3; i < jsonData2.length; i++) {
-// let arr2 = jsonData2[i];
-// for (let j = 3; j < arr2.length; j++) {
-// let obj3 = arr2[j];
-// if(obj3.button){
-// if (obj3.button && (obj3.button.name === "鏈洖闆�" || obj3.button.name === "NotZero" )) {
-// obj3.button.value = weihuiling[0][i];
-// // console.log(obj3.button.value)
-// }
-// }
-
-// }
+// if(jsonData2[2][3].button.value===1){
-
+// jsonData2[2][3].button.name.replace("鏈洖闆�","鍥為浂") ;
// }
-// console.log(jsonData2)
-//杩涚墖id
-jsonData2.forEach((item) => {
- item.forEach((subItem) => {
- if (subItem.read === 9999) {
- subItem.value = obj.jinpianid[0];
- }
- });
-});
-//鍙栫墖id
-jsonData2.forEach((item) => {
- item.forEach((subItem) => {
- if (subItem.read === 8888) {
- subItem.value = obj.qupianid[0];
- }
- });
-});
-
-//鎬ュ仠
+// console.log(jsonData2[5][4].button.value)
+if(jsonData2[2][3].button.value===1){
+ jsonData2[2][3].button.name=jsonData2[2][3].button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ jsonData2[2][3].button.name=jsonData2[2][3].button.name.replace("NotZero","Zero") ;
+}
+if(jsonData2[3][3].button.value===1){
+ jsonData2[3][3].button.name=jsonData2[3][3].button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ jsonData2[3][3].button.name=jsonData2[3][3].button.name.replace("NotZero","Zero") ;
+}
+if(jsonData2[4][4].button.value===1){
+ jsonData2[4][4].button.name=jsonData2[4][4].button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ jsonData2[4][4].button.name=jsonData2[4][4].button.name.replace("NotZero","Zero") ;
+}
+if(jsonData2[5][4].button.value===1){
+ jsonData2[5][4].button.name=jsonData2[5][4].button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ jsonData2[5][4].button.name=jsonData2[5][4].button.name.replace("NotZero","Zero") ;
+}
-
-
-
-
- }
-}, 50);
-
- document.addEventListener('mouseover', handleMouseMove);
};
@@ -716,4 +704,9 @@
.jiting{
background-color: green;
}
+
+.error-button3{
+ background-color: green;
+
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0