From 0c5f7c66f34b02c07c3a1bf9832ef402fa26339d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 06 五月 2024 10:18:11 +0800
Subject: [PATCH] 未回零显示问题
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 12 ++++++------
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 8 ++++----
CanadaMes-ui/src/lang/locales/en-US.json | 2 +-
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 24 ++++++++++++------------
CanadaMes-ui/src/configuration/ServoManualone.json | 8 ++++----
CanadaMes-ui/src/lang/locales/zh-CN.json | 2 +-
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index 76998d9..4771acb 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -219,7 +219,7 @@
{
"button": {
"name": "鏈洖闆�",
- "value":1,
+ "value":0,
"address":"DB10.0",
"type":"66"
}
@@ -260,7 +260,7 @@
{
"button": {
"name": "鏈洖闆�",
- "value":1,
+ "value":0,
"address":"DB10.0",
"type":"66"
}
@@ -307,7 +307,7 @@
"button": {
"name": "鏈洖闆�",
- "value":1,
+ "value":0,
"address":"DB10.0",
"type":"66"
}
@@ -356,7 +356,7 @@
} ,{
"button": {
"name": "鏈洖闆�",
- "value":1,
+ "value":0,
"address":"DB10.0",
"type":"66"
}
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 19d8a6b..e17d9b9 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,6 @@
{
"Clear":"Clear",
- "ip":"localhost",
+ "ip":"192.168.10.21",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 1a93fd5..d222752 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,6 +1,6 @@
{
"Clear":"娓呴櫎",
- "ip":"localhost",
+ "ip":"192.168.10.21",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index e6f8a34..df6f4bb 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -78,12 +78,12 @@
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
<el-button v-if="item.button && language === 'en-US' && item.state != 0" :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 }"
+ :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 1,'error-button3': item.button.name === 'Zero' && item.button.value === 0,'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' && item.state != 0" :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 }"
+ :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>
@@ -707,7 +707,7 @@
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("鏈洖闆�","宸插洖闆�") ;
}
@@ -715,7 +715,7 @@
obj.button.name =obj.button.name.replace("NotZero","Zero") ;
}
}
- 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("宸插洖闆�","鏈洖闆�") ;
}
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 9004e62..002579e 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 === 'NotZero' && item.button.value === 1,'error-button3': item.button.name === 'Zero' && item.button.value ===0,'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' && 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>
@@ -538,7 +538,7 @@
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("鏈洖闆�","宸插洖闆�") ;
}
@@ -546,7 +546,7 @@
obj.button.name =obj.button.name.replace("NotZero","Zero") ;
}
}
- 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("宸插洖闆�","鏈洖闆�") ;
}
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 3e7885e..0c6c68e 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -195,9 +195,9 @@
'error-button':
item.button.name === 'Fault' && item.button.value === 1,
'error-button2':
- item.button.name === 'NotZero' && item.button.value === 0,
+ item.button.name === 'NotZero' && item.button.value === 1,
'error-button3':
- item.button.name === 'Zero' && item.button.value === 1,
+ item.button.name === 'Zero' && item.button.value === 0,
fuwei:
item.button.name === 'Reset' && item.button.value === 1,
huiling:
@@ -238,9 +238,9 @@
'error-button':
item.button.name === '鏁呴殰' && item.button.value === 1,
'error-button3':
- item.button.name === '宸插洖闆�' && item.button.value === 1,
+ item.button.name === '宸插洖闆�' && item.button.value === 0,
'error-button2':
- item.button.name === '鏈洖闆�' && item.button.value === 0,
+ item.button.name === '鏈洖闆�' && item.button.value === 1,
fuwei: item.button.name === '澶嶄綅' && item.button.value === 1,
huiling:
item.button.name === '鍥為浂' && item.button.value === 1,
@@ -832,7 +832,7 @@
// console.log(jsonData2[5][4].button.value)
if (
- jsonData2[2][3].button.value === 1 &&
+ jsonData2[2][3].button.value === 0 &&
(jsonData2[2][3].button.name === "NotZero" ||
jsonData2[2][3].button.name === "鏈洖闆�")
) {
@@ -846,7 +846,7 @@
);
}
if (
- jsonData2[3][3].button.value === 1 &&
+ jsonData2[3][3].button.value === 0 &&
(jsonData2[3][3].button.name === "NotZero" ||
jsonData2[3][3].button.name === "鏈洖闆�")
) {
@@ -860,7 +860,7 @@
);
}
if (
- jsonData2[4][4].button.value === 1 &&
+ jsonData2[4][4].button.value === 0 &&
(jsonData2[4][4].button.name === "NotZero" ||
jsonData2[4][4].button.name === "鏈洖闆�")
) {
@@ -874,7 +874,7 @@
);
}
if (
- jsonData2[5][4].button.value === 1 &&
+ jsonData2[5][4].button.value === 0 &&
(jsonData2[5][4].button.name === "NotZero" ||
jsonData2[5][4].button.name === "鏈洖闆�")
) {
@@ -889,7 +889,7 @@
}
if (
- jsonData2[2][3].button.value === 0 &&
+ jsonData2[2][3].button.value === 1 &&
(jsonData2[2][3].button.name === "Zero" ||
jsonData2[2][3].button.name === "宸插洖闆�")
) {
@@ -903,7 +903,7 @@
);
}
if (
- jsonData2[3][3].button.value === 0 &&
+ jsonData2[3][3].button.value === 1 &&
(jsonData2[3][3].button.name === "Zero" ||
jsonData2[3][3].button.name === "宸插洖闆�")
) {
@@ -917,7 +917,7 @@
);
}
if (
- jsonData2[4][4].button.value === 0 &&
+ jsonData2[4][4].button.value === 1 &&
(jsonData2[4][4].button.name === "Zero" ||
jsonData2[4][4].button.name === "宸插洖闆�")
) {
@@ -931,7 +931,7 @@
);
}
if (
- jsonData2[5][4].button.value === 0 &&
+ jsonData2[5][4].button.value === 1 &&
(jsonData2[5][4].button.name === "Zero" ||
jsonData2[5][4].button.name === "宸插洖闆�")
) {
--
Gitblit v1.8.0