From 31101f632c27c05d15f30ca3084e3ed3da2a29af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 十二月 2023 11:42:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 379 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 317 insertions(+), 62 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 9d37abe..9323ec7 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -11,34 +11,41 @@
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
}}</router-link>
- <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link>
</el-breadcrumb>
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
-
- <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
- }}</router-link>
- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
- }}</router-link>
- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" @click="closeSocket()" active-class="blue-button">{{ $t('Parameter2')
- }}</router-link>
- <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
- }}</router-link>
- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
- }}</router-link>
- <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition')
- }}</router-link>
- <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition2')
- }}</router-link>
- <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
- $t('AutomaticParameterSetting')
+ <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Automatic State')
}}</router-link>
<router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualJog')
}}</router-link>
+
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+
+<router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Servomanualone')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
+ }}</router-link>
+
+ <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Address parameter settings')
+ }}</router-link>
+ <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Positioning2')
+ }}</router-link>
+
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Speed parameter settings')
+ }}</router-link>
+
</el-breadcrumb>
<el-row :gutter="26">
@@ -56,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}" @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,'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>
</div>
</div>
</el-card>
@@ -77,11 +84,13 @@
export default {
name: "ServoManualone",
mixins: [LanguageMixin],
-
+
data() {
return {
jsonData: data ,
language:this.$i18n.locale,
+zhi:"1",
+zhi2:"1"
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
}
},
@@ -90,7 +99,7 @@
this.initWebSocket();
const language = this.$i18n.locale;
- console.log(language);
+ // console.log(language);
if (language === 'en-US') {
this.replaceChineseWithEnglish();
}
@@ -110,17 +119,17 @@
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) {
+
+//A01鍗婅嚜鍔ㄥ惎鍔ㄦ彁浜�
if (currentButtonName === 'A01鍗婅嚜鍔ㄥ惎鍔�' ||currentButtonName === 'A01 Semi-Auto Start') {
const data = [];
@@ -148,7 +157,8 @@
data.push(values);
}
-data.push([]);
+data.push([],[], [],);
+
const jsonObject = { data };
@@ -158,6 +168,7 @@
socket?.send(jsonString);
}
+ //A02鍗婅嚜鍔ㄥ惎鍔� 鎻愪氦
if (currentButtonName === 'A02鍗婅嚜鍔ㄥ惎鍔�' ||currentButtonName === 'A02 Semi-Auto Start') {
const data2 = [];
@@ -174,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 => {
@@ -184,9 +195,9 @@
const values2 = inputData.map(item => item.value);
data2.push(values2);
+ data2.push([], [],[], []);
}
-
const jsonObject = { data:data2 };
@@ -197,6 +208,8 @@
socket?.send(jsonString);
}
+
+ //澶嶄綅鎻愪氦
if (currentButtonName === '澶嶄綅' || currentButtonName === 'Reset') {
const data2 = [];
@@ -212,6 +225,7 @@
// 鍦� data2 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
data2.unshift([], []);
+ data2.push([], [], [], [], []);
// 鍒涘缓 jsonObject2 瀵硅薄锛屽苟娣诲姞 data2 灞炴��
const jsonObject2 = { data: data2 };
@@ -220,12 +234,12 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
socket?.send(jsonString2);
- setTimeout(()=>
- window.location.reload(),2000
- )
+ // setTimeout(()=>
+ // window.location.reload(),2000
+ // )
}
-
+////鍥為浂鎻愪氦
if (currentButtonName === '鍥為浂' || currentButtonName === 'Home') {
const data3 = [];
const resetButtonValues3 = this.jsonData.map(item => {
@@ -239,37 +253,184 @@
// 鍦� 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
+ // )
}
+// if (currentButtonName === 'Abort/ResumeTasks' || currentButtonName === '鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨') {
+// const data3 = [];
+// const resetButtonValues3 = this.jsonData.map(item => {
+// const buttonItem3 = item.find(subItem => subItem.button && ['Abort/resumeTasks', '鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨'].includes(subItem.button.name));
+
+// return buttonItem3 ? buttonItem3.button.value : null;
+// }).filter(value => value !== null);
+
+// // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+// data3.push(resetButtonValues3.flat());
+
+// // 鍦� data3 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
+
+// data3.push([], [], [],[], [], [], [],[]);
+
+// // 鍒涘缓 jsonObject3 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
+// const jsonObject3 = { data: data3 };
+
+// // 鎻愪氦鏁版嵁鍒板悗绔�
+// const jsonString3 = JSON.stringify(jsonObject3);
+// console.log('鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨:', jsonString3);
+// socket?.send(jsonString3);
+// // setTimeout(()=>
+// // window.location.reload(),2000
+// // )
+// }
+//A01鍗婅嚜鍔ㄦ彁浜�
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' ) {
+ // 鑾峰彇鎵�鏈塩lass涓簊pecial-class2鐨勫厓绱�
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;
+ // 閬嶅巻jsonData
+ for (let i = 0; i < this.jsonData.length; i++) {
+ let arr = this.jsonData[i];
+ // 閬嶅巻arr
+ for (let j = 0; j < arr.length; j++) {
+ let obj2 = arr[j];
+ // 濡傛灉button鐨刵ame涓篈02鍗婅嚜鍔ㄦ垨鑰匒02 Semi-Auto
+ if (obj2.button && (obj2.button.name === "A02鍗婅嚜鍔�" || obj2.button.name === "A02 Semi-Auto")) {
+ // 璁剧疆button鐨剉alue涓�1
+ obj2.button.value = 1;
+ // console.log(obj2.button.value)
+ }
+ }
+
+
+ }
+
+ }else{
+ // 濡傛灉鍏冪礌鏄剧ず
+ elements[i].style.display = 'none';
+ this.zhi2=0;
+ // 閬嶅巻jsonData
+ for (let i = 0; i < this.jsonData.length; i++) {
+ let arr = this.jsonData[i];
+ // 閬嶅巻arr
+ for (let j = 0; j < arr.length; j++) {
+ let obj2 = arr[j];
+ // 濡傛灉button鐨刵ame涓篈02鍗婅嚜鍔ㄦ垨鑰匒02 Semi-Auto
+ if (obj2.button && (obj2.button.name === "A02鍗婅嚜鍔�" || obj2.button.name === "A02 Semi-Auto")) {
+ // 璁剧疆button鐨剉alue涓�0
+ obj2.button.value = 0;
+ // console.log(obj2.button.value)
+ }
+ }
+
+
+ }
}
}
+
+ // 灏唞hi2娣诲姞鍒癲ata鏁扮粍涓�
+ data.push([this.zhi2]);
+
+ // 灏哾ata鏁扮粍娣诲姞鍒癹sonObject涓�
+ data.unshift([],[],[],[],[],[],[]);
+
+
+const jsonObject = { data };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
+
}
@@ -285,13 +446,13 @@
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();
socket = null;
}
-
// 寮�鍚竴涓獁ebsocket鏈嶅姟
socket = new WebSocket(socketUrl);
@@ -307,14 +468,40 @@
}
let obj = JSON.parse(msg.data);
- // console.log(obj)
+ console.log(obj)
const weihuiling=obj.weihuiling;
const jsonData2 = this.jsonData;
const handleMouseMove = throttle(function(event) {
const inputBox = document.querySelectorAll('.el-card__body');
const target = event.target;
- if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+ 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++) {
jsonData2[i].forEach((item, index) => {
@@ -325,7 +512,7 @@
}
-
+//鏁呴殰鏇存柊
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
@@ -333,30 +520,58 @@
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 = 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)
+// 澶嶄綅鏇存柊
+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)
}
+ }
- }
+
+}
+
+
+
+
+
+
+
+//鏈洖闆舵洿鏂�
+
+jsonData2[2][3].button.value = weihuiling[0][0];
+jsonData2[3][3].button.value = weihuiling[0][1];
+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)
+// }
+
+// }
- }
+// }
-}
+// }
// console.log(jsonData2)
+//杩涚墖id
jsonData2.forEach((item) => {
item.forEach((subItem) => {
if (subItem.read === 9999) {
@@ -364,7 +579,7 @@
}
});
});
-
+//鍙栫墖id
jsonData2.forEach((item) => {
item.forEach((subItem) => {
if (subItem.read === 8888) {
@@ -372,6 +587,13 @@
}
});
});
+
+
+//鎬ュ仠
+
+
+
+
@@ -405,6 +627,7 @@
socket?.send(JSON.stringify(this.messagepack));
},
+ //鏇挎崲璇█
replaceChineseWithEnglish() {
@@ -436,7 +659,11 @@
</script>
<style scoped>
+html,body{
+width:100%;
+height:85%;
+}
.item-row {
display: flex;
@@ -459,6 +686,34 @@
.error-button2 {
background-color: red;
}
+.fuwei {
+ background-color: green;
+}
+
+.qidong {
+ background-color: green;
+}
+
+.qidong3 {
+ background-color: green;
+}
+.qidong {
+ background-color: green;
+}
+
+.qidong4 {
+ background-color: green;
+}
+.qidong5 {
+ background-color: green;
+}
+
+.huiling {
+ background-color: green;
+}
+.jiting{
+ background-color: green;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0