From 82c2df0968b099bd589936adc5b28c1ac4827a05 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 04 十二月 2023 08:20:07 +0800
Subject: [PATCH] 更新测试后电气管理
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 154 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 114 insertions(+), 40 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index a79506e..50d9f61 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -7,8 +7,8 @@
}}</router-link>
<router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
}}</router-link>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+ }}</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">{{
@@ -23,8 +23,8 @@
}}</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" active-class="blue-button">{{ $t('Parameter2')
- }}</router-link> -->
+ <router-link to="/Electrical/Parameter2" tag="el-button" type="text" 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>
@@ -47,18 +47,22 @@
<el-row :gutter="20">
<el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
- <el-card class="json-block" style="width:485px;">
+ <el-card class="json-block" style="width:600px;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
- <span class="name" style="width:100px;">{{ item.name }}</span>
+ <span class="name" style="width:300px;">{{ item.name }}</span>
<el-input style="width:250px;" v-if="item.state != 0 && item.type === '0'" v-model="item.value"
class="input-box"></el-input>
</div>
</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 && item.button.state != 0" :name="item.button.name" v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && 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 === 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>
</div>
@@ -80,25 +84,45 @@
mixins: [LanguageMixin],
data () {
return {
- jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ jsonData: data, // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ language: this.$i18n.locale,
}
},
- created () {
+
+ activated () {
+
this.initWebSocket();
- // console.log('jsonData:', this.jsonData);
+ const language = this.$i18n.locale;
+ console.log(language);
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ }
+ this.$forceUpdate();
+
},
+
methods: {
+ closeSocket () {
+ // 鍏抽棴 WebSocket 杩炴帴
+ socket.close();
+ },
updateButtonValue (dataGroup, itemIndex) {
// 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
- this.$set(dataGroup[itemIndex].button, 'value', 1);
+ 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缈昏浆鍚姩') {
+ if (currentButtonName === 'A01缈昏浆鍚姩' || currentButtonName === 'A01 SERVE TURN') {
const data = [];
for (let i = 0; i < 1; i++) {
@@ -110,6 +134,7 @@
data.push(values);
}
+ data.push([], [], [],[]);
@@ -122,7 +147,7 @@
}
- if (currentButtonName === 'A02缈昏浆鍚姩') {
+ if (currentButtonName === 'A02缈昏浆鍚姩' || currentButtonName === 'A02 SERVE TURN') {
const data = [];
for (let i = 1; i < 2; i++) {
@@ -134,7 +159,7 @@
data.unshift([]);
data.push(values);
}
-
+ data.push([], [], []);
const jsonObject = { data };
@@ -146,11 +171,12 @@
}
- if (currentButtonName === '鏁呴殰') {
+ if (currentButtonName === '鏁呴殰' || currentButtonName === 'Fault') {
const data2 = [];
const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '鏁呴殰');
+ const buttonItem = item.find(subItem => subItem.button && ['鏁呴殰', 'Fault'].includes(subItem.button.name));
+
return buttonItem ? buttonItem.button.value : null;
}).filter(value => value !== null);
@@ -158,6 +184,7 @@
data2.push(...resetButtonValues);
data2.unshift([], []);
const jsonObject2 = { data2 };
+ data2.push([], []);
// 鎻愪氦鏁版嵁鍒板悗绔�
const jsonString2 = JSON.stringify(jsonObject2);
@@ -167,18 +194,20 @@
}
- if (currentButtonName === '澶嶄綅') {
+ if (currentButtonName === '澶嶄綅' || currentButtonName === 'Reset') {
const data2 = [];
const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '澶嶄綅');
+ const buttonItem = item.find(subItem => subItem.button && ['澶嶄綅', 'Reset'].includes(subItem.button.name));
+
return buttonItem ? buttonItem.button.value : null;
}).filter(value => value !== null);
// 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
- data2.push(...resetButtonValues);
+ data2.push(resetButtonValues.flat());
data2.unshift([], [], []);
- const jsonObject2 = { data2 };
+ const jsonObject2 = { data:data2 };
+ data2.push([]);
// 鎻愪氦鏁版嵁鍒板悗绔�
const jsonString2 = JSON.stringify(jsonObject2);
@@ -188,19 +217,19 @@
}
- if (currentButtonName === '鍥為浂') {
+ if (currentButtonName === '鍥為浂' || currentButtonName === 'Zero') {
const data2 = [];
const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '鍥為浂');
+ const buttonItem = item.find(subItem => subItem.button && ['鍥為浂', 'Zero'].includes(subItem.button.name));
+
return buttonItem ? buttonItem.button.value : null;
}).filter(value => value !== null);
// 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
- data2.push(...resetButtonValues);
+ data2.push(resetButtonValues.flat());
data2.unshift([], [], [], []);
- const jsonObject2 = { data2 };
-
+ const jsonObject2 = { data:data2 };
// 鎻愪氦鏁版嵁鍒板悗绔�
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
@@ -244,7 +273,7 @@
let obj = JSON.parse(msg.data);
// console.log(obj)
const jsonData2 = this.jsonData;
-
+ const weihuiling = obj.weihuiling;
const handleMouseMove = throttle(function (event) {
const inputBox = document.querySelectorAll('.el-card__body');
const target = event.target;
@@ -276,32 +305,41 @@
});
// 閬嶅巻guzhang鏁扮粍
- for (let i = 0; i < obj.guzhang[0].length; i++) {
- const guzhangValue = obj.guzhang[0][i];
+ 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 === "Fault")) {
+ obj2.button.value = obj.guzhang[0][i];
+ // console.log(obj2.button.value)
+ }
+ }
- // 鏌ユ壘jsonData2涓甫鏈�"button"鐨勫璞★紝骞朵笖name绛変簬"鏁呴殰"
- for (let j = 0; j < jsonData2.length; j++) {
- const section = jsonData2[j];
- for (let k = 0; k < section.length; k++) {
- const item = section[k];
+ }
- if (item.button && item.button.name === "鏁呴殰") {
- // 鏇存柊value灞炴��
- item.button.value = guzhangValue;
- break;
+ for (let i = 0; i < jsonData2.length; i++) {
+ let arr2 = jsonData2[i];
+ for (let j = 0; 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)
}
+
}
-
}
+
+
}
}
- }, 200);
+ }, 50);
document.addEventListener('mouseover', handleMouseMove);
};
@@ -318,6 +356,9 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
+ this.$router.afterEach(function () {
+ socket.close();
+ })
}
},
@@ -325,6 +366,31 @@
socket?.send(JSON.stringify(this.messagepack));
+ },
+ replaceChineseWithEnglish () {
+
+
+ const nameMap = this.$t('Manualoneposition2lang')
+ this.jsonData = this.jsonData.map((item) => {
+ return item.map((obj) => {
+ if (obj.name) {
+ const newName = nameMap[obj.name] || obj.name;
+ return { ...obj, name: newName };
+ } else if (obj.button && obj.button.name) {
+ const newName = nameMap[obj.button.name] || obj.button.name;
+ return { ...obj, button: { ...obj.button, name: newName } };
+ } else if (obj.title && obj.title.name) {
+ const newName = nameMap[obj.title.name] || obj.title.name;
+ return { ...obj, title: { ...obj.title, name: newName } };
+ } else {
+ return obj;
+ }
+ });
+ });
+
+
+ console.log(this.jsonData)
+
}
}
@@ -348,4 +414,12 @@
.blue-button {
background-color: skyblue;
}
+
+.error-button {
+ background-color: red;
+}
+
+.error-button2 {
+ background-color: red;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0