From 625d2b6dd9bd4a1c63bf7e1b2701393d908f7a81 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 五月 2024 08:31:12 +0800
Subject: [PATCH] 客户数据库变更，部分铝框没有对应玻璃信息，扫码添加出片队列时，当铝框没有对应玻璃时直接添加到出片队列
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 9004e62..76b4fd6 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -67,12 +67,12 @@
</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' && item.button.name !== 'NotZero'" :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 === 'Zero' && item.button.value ===1,'greenbutton': item.button.name !== 'NotZero' && item.button.name !== 'Fault' && item.button.value === 1 }"
+ <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 === 'Homing Failure' && item.button.value === 1,'error-button3': item.button.name === 'Homing Complete' && item.button.value ===0,'greenbutton': item.button.name !== 'Homing Failure' && 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' && item.button.name !== '鏈洖闆�'" :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,'error-button3': item.button.name === '宸插洖闆�' && item.button.value === 1,'greenbutton': item.button.name !== '鏈洖闆�' && item.button.name !== '鏁呴殰' && item.button.value === 1 }"
+ <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 === 1,'error-button3': item.button.name === '宸插洖闆�' && item.button.value === 0,'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>
@@ -184,7 +184,7 @@
},
//鎻愪氦鏂规硶
submitDataToBackend (currentButtonName) {
- if (currentButtonName === 'A01缈昏浆鍚姩' || currentButtonName === 'A01 SERVE TURN') {
+ if (currentButtonName === 'A01缈昏浆鍚姩' || currentButtonName === 'A01 Tilt') {
const data = [];
const values = [this.jsonData[0][3].button.value]
@@ -216,7 +216,7 @@
}
- if (currentButtonName === 'A02缈昏浆鍚姩' || currentButtonName === 'A02 SERVE TURN') {
+ if (currentButtonName === 'A02缈昏浆鍚姩' || currentButtonName === 'A02 Tilt') {
const data = [];
const values = [this.jsonData[0][3].button.value]
@@ -463,7 +463,7 @@
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" || obj3.button.name === "宸插洖闆�" || obj3.button.name === "Zero")) {
+ if (obj3.button && (obj3.button.name === "鏈洖闆�" || obj3.button.name === "Homing Failure" || obj3.button.name === "宸插洖闆�" || obj3.button.name === "Homing Complete")) {
obj3.button.value = weihuiling[0][i];
// console.log(obj3.button.value)
}
@@ -538,20 +538,20 @@
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 && obj.button.value===0) {
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.name==="Homing Failure") {
+ obj.button.name =obj.button.name.replace("Homing Failure","Homing Complete") ;
}
}
- if (obj.button && obj.button.value===0) {
+ 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==="Zero") {
- obj.button.name =obj.button.name.replace("Zero","NotZero") ;
+ if ( obj.button.name==="Homing Complete") {
+ obj.button.name =obj.button.name.replace("Homing Complete","Homing Failure") ;
}
}
--
Gitblit v1.8.0