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/ManualonePosition.vue | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index e9b2d80..8f9607c 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -50,7 +50,7 @@
<el-row :gutter="10">
<el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
- <el-card class="json-block" style="width:585px;">
+ <el-card class="json-block" style="width:585px;margin-bottom: 10px;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
<span class="name" style="width:300px;">{{ item.name }}</span>
@@ -62,12 +62,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,'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 === 'NotZero' && 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' && 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,'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>
@@ -351,8 +351,39 @@
});
}
- //鏇存柊瀹炴椂浣嶇疆
- jsonData2.forEach((item) => {
+
+
+ //鏀瑰彉鐘舵�佹枃瀛�
+// for (let i = 2; i < jsonData2.length; i++) {
+// let arr6 = jsonData2[i];
+// for (let j = 2; j < arr6.length; j++) {
+// let obj6 = arr6[j];
+// if (obj6.button&& (obj6.button.name === "鏈洖闆�" || obj6.button.name === "NotZero")) {
+// if ( obj6.button.name.includes("鏈�")&& this.language==="zh-CN") {
+// console.log(obj6.button.name)
+// obj6.button.name =obj6.button.name.replace("鏈�","宸�") ;
+// }
+// if ( obj6.button.name.includes("NotZero")) {
+// obj6.button.name =obj6.button.name.replace("NotZero","Zero") ;
+// }
+// }
+
+
+// }
+// }
+
+
+
+
+ }
+ }, 50);
+
+ document.addEventListener('mouseover', handleMouseMove);
+
+
+
+ //鏇存柊瀹炴椂浣嶇疆
+ jsonData2.forEach((item) => {
item.forEach((subItem) => {
if (subItem.sending === 4) {
subItem.value = obj.shishi1[0][0];
@@ -413,12 +444,26 @@
}
+//鏀瑰彉鏈洖闆舵枃瀛�
+for (let i = 0; i < jsonData2.length; i++) {
+ 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.name.includes("鏈洖闆�")&& this.language==="zh-CN") {
+ obj.button.name =obj.button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ }
+ if ( obj.button.name.includes("NotZero")) {
+ obj.button.name =obj.button.name.replace("NotZero","Zero") ;
+ }
+ }
+
+
+}
+}
- }
- }, 200);
- document.addEventListener('mouseover', handleMouseMove);
};
@@ -506,4 +551,8 @@
background-color: green;
}
+.error-button3{
+ background-color: green;
+
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0