From fb32fb5bb4be336171dca41e62d3d6c6c5803f34 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 12 十二月 2023 17:02:55 +0800
Subject: [PATCH] A01启动 B01启动 增加plc地址 单独写入
---
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 306 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 222 insertions(+), 84 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 0eea377..6480322 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">
@@ -49,15 +56,18 @@
<div class="item-container">
<div class="item-row">
<span class="name" style='width:230px;'>{{ item.name }}</span>
- <el-input v-if="item.type === '0'" v-model="item.value" class='input-box' :class="{ 'special-class': groupIndex === 0,'special-class2': groupIndex === 1 }" v-show="groupIndex !== 0 && groupIndex !== 1" ></el-input>
+
+ <el-input v-if="item.type === '0' && groupIndex === 0" v-model="item.value" @keyup.enter.native="zuhe1" class='input-box' :class="{ 'special-class': groupIndex === 0,'special-class2': groupIndex === 1 }" v-show="groupIndex !== 0 && groupIndex !== 1" ></el-input>
+ <el-input v-else-if="item.type === '0' && groupIndex === 1" v-model="item.value" @keyup.enter.native="zuhe2" class='input-box' :class="{ 'special-class': groupIndex === 0,'special-class2': groupIndex === 1 }" v-show="groupIndex !== 0 && groupIndex !== 1" ></el-input>
+ <el-input v-else-if="item.type === '0' " v-model="item.value" class='input-box' :class="{ 'special-class': groupIndex === 0,'special-class2': groupIndex === 1 }" v-show="groupIndex !== 0 && groupIndex !== 1" ></el-input>
</div>
</div>
</el-col>
</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,'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>
+ <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,'error-button3': item.button.name === 'NotZero' && item.button.value === 1,'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' && item.button.value === 1,'jiting': item.button.name === 'Abort/ResumeTasks' && item.button.value === 1,'yihuiling': item.button.name === 'Zero' && 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-button3': 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,'yihuiling': item.button.name === '宸插洖闆�' && item.button.value === 1 }" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button>
</div>
</div>
</el-card>
@@ -92,7 +102,7 @@
this.initWebSocket();
const language = this.$i18n.locale;
- console.log(language);
+ // console.log(language);
if (language === 'en-US') {
this.replaceChineseWithEnglish();
}
@@ -120,11 +130,9 @@
this.$set(dataGroup[itemIndex].button, 'value', 1);
}
},
-submitDataToBackend(currentButtonName) {
+zuhe1(){
-//A01鍗婅嚜鍔ㄥ惎鍔ㄦ彁浜�
- if (currentButtonName === 'A01鍗婅嚜鍔ㄥ惎鍔�' ||currentButtonName === 'A01 Semi-Auto Start') {
- const data = [];
+ const data = [];
for (let i = 0; i < 1; i++) {
const inputData = this.jsonData[i].filter(item => item.type === '0' && item.read !== 9999).map(item => {
@@ -150,7 +158,69 @@
data.push(values);
}
-data.push([],[], [],);
+data.push([], [],[]);
+
+
+const jsonObject = { data };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
+
+},
+zuhe2(){
+
+ const data2 = [];
+
+for (let i = 1; i < 2; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0' && item.read !== 8888).map(item => {
+ return { value: item.value };
+ });
+
+ const values2 = inputData.map(item => item.value);
+
+ data2.push(values2);
+
+}
+data2.unshift([]);
+
+data2.push([], [],[]);
+
+for (let i = 1; i < 2; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0' && item.read == 8888).map(item => {
+ return { value: item.value };
+ });
+
+ const values2 = inputData.map(item => item.value);
+
+ data2.push(values2);
+ data2.push( [],[], []);
+
+}
+
+
+const jsonObject = { data:data2 };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
+
+},
+submitDataToBackend(currentButtonName) {
+
+//A01鍗婅嚜鍔ㄥ惎鍔ㄦ彁浜�
+ if (currentButtonName === 'A01鍗婅嚜鍔ㄥ惎鍔�' ||currentButtonName === 'A01 Semi-Auto Start') {
+ const data = [];
+
+
+ const values = [this.jsonData[0][10].button.value]
+
+ data.push(values);
+
+
+data.unshift([], [],[],[], [],[],[], []);
const jsonObject = { data };
@@ -166,31 +236,15 @@
if (currentButtonName === 'A02鍗婅嚜鍔ㄥ惎鍔�' ||currentButtonName === 'A02 Semi-Auto Start') {
const data2 = [];
-for (let i = 1; i < 2; i++) {
- const inputData = this.jsonData[i].filter(item => item.type === '0' && item.read !== 8888).map(item => {
- return { value: item.value };
- });
-
- const values2 = inputData.map(item => item.value);
+ const values2 = [this.jsonData[1][8].button.value]
data2.push(values2);
-}
-data2.unshift([]);
-data2.push([], []);
+ data2.unshift([],[], [],[],[], [],[],[], []);
-for (let i = 1; i < 2; i++) {
- const inputData = this.jsonData[i].filter(item => item.type === '0' && item.read == 8888).map(item => {
- return { value: item.value };
- });
- const values2 = inputData.map(item => item.value);
- data2.push(values2);
- data2.push([], [],[], []);
-
-}
const jsonObject = { data:data2 };
@@ -259,6 +313,8 @@
// window.location.reload(),2000
// )
}
+
+
//A01鍗婅嚜鍔ㄦ彁浜�
@@ -419,7 +475,6 @@
socket.close();
socket = null;
}
-
// 寮�鍚竴涓獁ebsocket鏈嶅姟
socket = new WebSocket(socketUrl);
@@ -435,7 +490,7 @@
}
let obj = JSON.parse(msg.data);
- // console.log(obj)
+ console.log(obj)
const weihuiling=obj.weihuiling;
const jsonData2 = this.jsonData;
@@ -443,6 +498,13 @@
const inputBox = document.querySelectorAll('.el-card__body');
const target = event.target;
if (obj.zuhe1 && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+
+ //鍚姩鎸夐挳
+
+
+
+
+
// 鎵ц鏇存柊閫昏緫
for (let i = 0; i < 6; i++) {
jsonData2[i].forEach((item, index) => {
@@ -452,8 +514,44 @@
});
}
+//杩涚墖id
+jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.read === 9999) {
+ subItem.value = obj.jinpianid[0];
+ }
+ });
+});
+//鍙栫墖id
+jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.read === 8888) {
+ subItem.value = obj.qupianid[0];
+ }
+ });
+});
-//鏁呴殰鏇存柊
+
+
+
+
+
+ }
+}, 50);
+
+ document.addEventListener('mouseover', handleMouseMove);
+
+
+ if (obj.qidong){
+
+
+
+
+ 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];
+ //鏁呴殰鏇存柊
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
@@ -481,48 +579,61 @@
}
+
+
//鏈洖闆舵洿鏂�
-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)
- }
+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];
- }
-
- }
-
+// if(jsonData2[2][3].button.value===1){
+
+// jsonData2[2][3].button.name.replace("鏈洖闆�","鍥為浂") ;
+// }
+
+// console.log(jsonData2[5][4].button.value)
+if(jsonData2[2][3].button.value===1 && (jsonData2[2][3].button.name==="NotZero" ||jsonData2[2][3].button.name==="鏈洖闆�")){
+ jsonData2[2][3].button.name=jsonData2[2][3].button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ jsonData2[2][3].button.name=jsonData2[2][3].button.name.replace("NotZero","Zero") ;
}
-// console.log(jsonData2)
-//杩涚墖id
-jsonData2.forEach((item) => {
- item.forEach((subItem) => {
- if (subItem.read === 9999) {
- subItem.value = obj.jinpianid[0];
- }
- });
-});
-//鍙栫墖id
-jsonData2.forEach((item) => {
- item.forEach((subItem) => {
- if (subItem.read === 8888) {
- subItem.value = obj.qupianid[0];
- }
- });
-});
+if(jsonData2[3][3].button.value===1 && (jsonData2[3][3].button.name==="NotZero" ||jsonData2[3][3].button.name==="鏈洖闆�")){
+ jsonData2[3][3].button.name=jsonData2[3][3].button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ jsonData2[3][3].button.name=jsonData2[3][3].button.name.replace("NotZero","Zero") ;
+}
+if(jsonData2[4][4].button.value===1 && (jsonData2[4][4].button.name==="NotZero" ||jsonData2[4][4].button.name==="鏈洖闆�")){
+ jsonData2[4][4].button.name=jsonData2[4][4].button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ jsonData2[4][4].button.name=jsonData2[4][4].button.name.replace("NotZero","Zero") ;
+}
+if(jsonData2[5][4].button.value===1 && (jsonData2[5][4].button.name==="NotZero" ||jsonData2[5][4].button.name==="鏈洖闆�")){
+ jsonData2[5][4].button.name=jsonData2[5][4].button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ jsonData2[5][4].button.name=jsonData2[5][4].button.name.replace("NotZero","Zero") ;
+}
- }
-}, 50);
- document.addEventListener('mouseover', handleMouseMove);
+if(jsonData2[2][3].button.value===0 && (jsonData2[2][3].button.name==="Zero" ||jsonData2[2][3].button.name==="宸插洖闆�")){
+ jsonData2[2][3].button.name=jsonData2[2][3].button.name.replace("宸插洖闆�","鏈洖闆�") ;
+ jsonData2[2][3].button.name=jsonData2[2][3].button.name.replace("Zero","NotZero") ;
+}
+if(jsonData2[3][3].button.value===0 && (jsonData2[3][3].button.name==="Zero" ||jsonData2[3][3].button.name==="宸插洖闆�")){
+ jsonData2[3][3].button.name=jsonData2[3][3].button.name.replace("宸插洖闆�","鏈洖闆�") ;
+ jsonData2[3][3].button.name=jsonData2[3][3].button.name.replace("Zero","NotZero") ;
+}
+if(jsonData2[4][4].button.value===0 && (jsonData2[4][4].button.name==="Zero" ||jsonData2[4][4].button.name==="宸插洖闆�")){
+ jsonData2[4][4].button.name=jsonData2[4][4].button.name.replace("宸插洖闆�","鏈洖闆�") ;
+ jsonData2[4][4].button.name=jsonData2[4][4].button.name.replace("Zero","NotZero") ;
+}
+if(jsonData2[5][4].button.value===0 && (jsonData2[5][4].button.name==="Zero" ||jsonData2[5][4].button.name==="宸插洖闆�")){
+ jsonData2[5][4].button.name=jsonData2[5][4].button.name.replace("宸插洖闆�","鏈洖闆�") ;
+ jsonData2[5][4].button.name=jsonData2[5][4].button.name.replace("Zero","NotZero") ;
+}
+
+}
+
};
@@ -616,9 +727,36 @@
background-color: green;
}
-.qidong2 {
+.qidong3 {
+ background-color: green;
+}
+.qidong {
+ background-color: green;
+}
+
+.qidong4 {
background-color: green;
}
+.qidong5 {
+ background-color: green;
+}
+
+.huiling {
+ background-color: green;
+}
+.jiting{
+ background-color: green;
+}
+
+.error-button3{
+ background-color: green;
+
+}
+
+.yihuiling{
+
+ background-color: green;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0