From 24385ce9fee382e9600ce03108a814a66990981c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 05 十二月 2023 08:10:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 181 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 157 insertions(+), 24 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 9d37abe..4512f87 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -56,8 +56,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}" @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}" @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,'fuwei': item.button.name === 'Reset' && 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}" @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,'qidong': item.button.name === 'A01鍗婅嚜鍔�' && item.button.value === 1,'qidong2': item.button.name === 'A02鍗婅嚜鍔�' && item.button.value === 1 }" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button>
</div>
</div>
</el-card>
@@ -77,11 +77,13 @@
export default {
name: "ServoManualone",
mixins: [LanguageMixin],
-
+
data() {
return {
jsonData: data ,
language:this.$i18n.locale,
+zhi:"1",
+zhi2:"1"
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
}
},
@@ -110,15 +112,13 @@
updateButtonValue(dataGroup, itemIndex) {
- // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
- this.$set(dataGroup[itemIndex].button, 'value', 1);
-
- // 灏嗗叾浠栨寜閽殑鍊艰涓�0
- // dataGroup.forEach((item, index) => {
- // if (index !== itemIndex && item.button) {
- // this.$set(item.button, 'value', 0);
- // }
- // });
+ if (dataGroup[itemIndex].button.value === 1) {
+ // 濡傛灉褰撳墠鎸夐挳鐨勫�兼槸 0锛屽皢鍏惰涓� 1
+ this.$set(dataGroup[itemIndex].button, 'value', 0);
+ } else {
+ // 鍚﹀垯灏嗗叾璁句负 0
+ this.$set(dataGroup[itemIndex].button, 'value', 1);
+ }
},
submitDataToBackend(currentButtonName) {
if (currentButtonName === 'A01鍗婅嚜鍔ㄥ惎鍔�' ||currentButtonName === 'A01 Semi-Auto Start') {
@@ -148,7 +148,8 @@
data.push(values);
}
-data.push([]);
+data.push([],[], [],);
+
const jsonObject = { data };
@@ -174,7 +175,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 => {
@@ -184,9 +185,9 @@
const values2 = inputData.map(item => item.value);
data2.push(values2);
+ data2.push([], [],[], []);
}
-
const jsonObject = { data:data2 };
@@ -212,6 +213,7 @@
// 鍦� data2 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
data2.unshift([], []);
+ data2.push([], [], [], [], []);
// 鍒涘缓 jsonObject2 瀵硅薄锛屽苟娣诲姞 data2 灞炴��
const jsonObject2 = { data: data2 };
@@ -220,9 +222,9 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
socket?.send(jsonString2);
- setTimeout(()=>
- window.location.reload(),2000
- )
+ // setTimeout(()=>
+ // window.location.reload(),2000
+ // )
}
@@ -239,17 +241,18 @@
// 鍦� data3 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
data3.unshift([], [], []);
+ data3.push([], [], [], []);
- // 鍒涘缓 jsonObject2 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
+ // 鍒涘缓 jsonObject3 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
const jsonObject3 = { data: data3 };
// 鎻愪氦鏁版嵁鍒板悗绔�
const jsonString3 = JSON.stringify(jsonObject3);
console.log('鍥為浂:', jsonString3);
socket?.send(jsonString3);
- setTimeout(()=>
- window.location.reload(),2000
- )
+ // setTimeout(()=>
+ // window.location.reload(),2000
+ // )
}
@@ -257,19 +260,123 @@
if (currentButtonName === 'A01鍗婅嚜鍔�' || currentButtonName === 'A01 Semi-Auto' ) {
const elements = document.getElementsByClassName('special-class');
+ const data = [];
+
for (let i = 0; i < elements.length; i++) {
if (elements[i].style.display === 'none') {
elements[i].style.display = ''; // 鏄剧ず鍏冪礌
+ this.zhi=1;
+ // if(this.jsonData[0].button.name==='A01鍗婅嚜鍔�' || this.jsonData[0].button.name === 'A01 Semi-Auto'){
+ // this.jsonData[0].button.value=1
+ // }
+
+
+ for (let i = 0; i < this.jsonData.length; i++) {
+ let arr = this.jsonData[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj2 = arr[j];
+ if (obj2.button && (obj2.button.name === "A01鍗婅嚜鍔�" || obj2.button.name === "A01 Semi-Auto")) {
+ obj2.button.value = 1;
+ // console.log(obj2.button.value)
+ }
+ }
+
+
+ }
+ }else{
+ elements[i].style.display = 'none';
+ this.zhi=0;
+ // if(this.jsonData[0].button.name==='A01鍗婅嚜鍔�' || this.jsonData[0].button.name === 'A01 Semi-Auto'){
+ // this.jsonData[0].button.value=0
+ // }
+
+ for (let i = 0; i < this.jsonData.length; i++) {
+ let arr = this.jsonData[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj2 = arr[j];
+ if (obj2.button && (obj2.button.name === "A01鍗婅嚜鍔�" || obj2.button.name === "A01 Semi-Auto")) {
+ obj2.button.value = 0;
+ // console.log(obj2.button.value)
+ }
+ }
+
+
+ }
}
}
+
+
+
+ data.push([this.zhi]);
+
+ data.unshift([],[],[],[],[],[]);
+data.push([]);
+
+
+
+
+const jsonObject = { data };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
+
}
+
+
+
if (currentButtonName === 'A02鍗婅嚜鍔�' || currentButtonName === 'A02 Semi-Auto' ) {
const elements = document.getElementsByClassName('special-class2');
+
+ const data = [];
for (let i = 0; i < elements.length; i++) {
if (elements[i].style.display === 'none') {
elements[i].style.display = ''; // 鏄剧ず鍏冪礌
+ this.zhi2=1;
+ for (let i = 0; i < this.jsonData.length; i++) {
+ let arr = this.jsonData[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj2 = arr[j];
+ if (obj2.button && (obj2.button.name === "A02鍗婅嚜鍔�" || obj2.button.name === "A02 Semi-Auto")) {
+ obj2.button.value = 1;
+ // console.log(obj2.button.value)
+ }
+ }
+
+
+ }
+
+ }else{
+ elements[i].style.display = 'none';
+ this.zhi2=0;
+ for (let i = 0; i < this.jsonData.length; i++) {
+ let arr = this.jsonData[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj2 = arr[j];
+ if (obj2.button && (obj2.button.name === "A02鍗婅嚜鍔�" || obj2.button.name === "A02 Semi-Auto")) {
+ obj2.button.value = 0;
+ // console.log(obj2.button.value)
+ }
+ }
+
+
+ }
}
}
+
+ data.push([this.zhi2]);
+
+ data.unshift([],[],[],[],[],[],[]);
+
+
+const jsonObject = { data };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
+
}
@@ -285,7 +392,8 @@
if (typeof WebSocket === "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
- let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
+
+ let socketUrl = "ws://" +this.$t('ip')+ ":8888" + "/springboot-vue3/api/talk/" + viewname;
if (socket != null) {
socket.close();
@@ -333,7 +441,21 @@
let obj2 = arr[j];
if (obj2.button && (obj2.button.name === "鏁呴殰" || obj2.button.name === "Fault")) {
obj2.button.value = obj.guzhang[0][i];
- // console.log(obj2.button.value)
+ // console.log(obj2.button.value)
+ }
+ }
+
+
+}
+
+
+for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj2 = arr[j];
+ if (obj2.button && (obj2.button.name === "澶嶄綅" || obj2.button.name === "Reset")) {
+ obj2.button.value = obj.fuwei[0][i];
+ // console.log(obj2.button.value)
}
}
@@ -459,6 +581,17 @@
.error-button2 {
background-color: red;
}
+.fuwei {
+ background-color: green;
+}
+
+.qidong {
+ background-color: green;
+}
+
+.qidong2 {
+ background-color: green;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0