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/Positioning2.vue | 126 ++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 35 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
index 70b5e31..d460403 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -7,44 +7,49 @@
}}</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">{{
- $t('ServoManual')
+ $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" 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="18" class='card'>
+ <el-row :gutter="18" class='card'>
<el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
<el-card class="json-block">
<div class="button-row" style="display: flex; justify-content: space-between;">
@@ -57,6 +62,7 @@
<span class="name" style="width:250px;">{{ item.name }}</span>
<el-input v-if="item.type === '0'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend"></el-input>
<!-- <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
+ <span v-if="item.unit" :name="item.unit" >{{ item.unit }}</span>
</div>
</div>
@@ -80,23 +86,37 @@
jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
}
},
- created () {
- this.initWebSocket();
- // console.log('jsonData:', this.jsonData);
-
- },
+ activated(){
+ // 婵�娲荤粍浠舵椂璋冪敤
+ // 鍒濆鍖朩ebSocket
+
+ this.initWebSocket ();
+ // 鑾峰彇褰撳墠璇█
+ const language = this.$i18n.locale;
+ console.log(language);
+ // 濡傛灉褰撳墠璇█鏄嫳璇紝鍒欏皢涓枃鏇挎崲涓鸿嫳鏂�
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ }
+ this.$forceUpdate();
+ },
methods: {
updateButtonValue (dataGroup, itemIndex) {
this.$set(dataGroup[itemIndex].button, 'value', 1); // 鐐瑰嚮鎸夐挳鍚庡皢鍊兼敼涓�1
},
- submitDataToBackend () {
+ //鎻愪氦鏁版嵁鍒板悗绔�
+ submitDataToBackend () {
+ // 灏唈sonData杞崲涓烘暟缁�
const inputData = this.jsonData.map(dataGroup => {
return dataGroup.map(item => {
+ // 濡傛灉鏄暟瀛楃被鍨嬶紝鍒欒浆鎹负鏁存暟
if (item.type === '0') {
return { value: parseInt(item.value) };
+ // 濡傛灉鏄寜閽被鍨嬶紝鍒欒浆鎹负鏁存暟
} else if (item.button) {
return { value: parseInt(item.title.value) };
}
+ // 鍚﹀垯杩斿洖null
return null;
});
});
@@ -104,9 +124,11 @@
// 灏唅nputData杞崲涓烘暣鏁版暟缁�
const integerArray = inputData.map(dataGroup => {
return dataGroup.map(item => {
+ // 濡傛灉item涓嶄负null锛屽垯杩斿洖item.value
if (item !== null) {
return item.value;
}
+ // 鍚﹀垯杩斿洖null
return null;
});
});
@@ -125,7 +147,7 @@
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();
@@ -151,11 +173,13 @@
document.addEventListener('mouseover', function (event) {
const inputBox = document.querySelectorAll('.el-card__body');
const target = event.target;
- if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+ const parms = obj.params;
+ if ( parms && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
// 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
// this.submitDataToBackend()
- const parms = obj.params;
+
+ // console.log(parms)
let index = 0;
for (let i = 0; i < jsonData2.length; i++) {
@@ -186,12 +210,44 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
+ this.$router.afterEach(function(){
+ socket.close();
+ })
}
},
- send () {
+ //璇█鏇挎崲
+ replaceChineseWithEnglish() {
+
+
+ const nameMap= this.$t('langPositioning2')
+ 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)
+
+},
+ send () {
+
+
+ // 鍚戞湇鍔″櫒鍙戦�佹秷鎭�
+
+ // 鍚戞湇鍔″櫒鍙戦�佹秷鎭�
socket?.send(JSON.stringify(this.messagepack));
},
--
Gitblit v1.8.0