From c3204d686fbf8a64dd7fa4dcbb48c0a075df06e0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 05 十二月 2023 08:06:19 +0800
Subject: [PATCH] 更新电气管理界面
---
CanadaMes-ui/src/views/Electrical/Parameter.vue | 138 ++++++++++++++++++++-------------------------
1 files changed, 62 insertions(+), 76 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index b41aaf1..bb15ca4 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -12,24 +12,26 @@
}}</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>
</el-breadcrumb>
<div>Parameter</div>
<el-form label-width="100px" style="display: flex; flex-wrap: wrap;" :model="messagepack.data">
<div id="btn_div">
- <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')
- }}</el-button>
+ <!-- <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')
+ }}</el-button> -->
</div>
- <div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
+ <div class="kuai_div" v-for="(item, index) in jsonData" :key="index">
<el-input style="width: 280px; border:none;" class="in_mc" v-model="item.name" readonly></el-input>
-
- <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
- <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>
- <input v-model="item.value2" type="number"
- style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
- <span style="margin-right: 5px; width: 50px;">{{ item.unit }}</span>
+ <!-- <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span> -->
+ <!-- <span style="margin-right: 5px; font-size: 14px;color: red;">|</span> -->
+ <el-input v-model="item.value" type="number"
+ style="width: 143px; margin-right: 5px; margin-top: 5px; font-size: 16px;border:none" class="input-box"
+ @keyup.enter.native="send"></el-input>
+ <span style="margin-right: 5px; width: 50px;" >{{ item.unit }}</span>
</div>
</el-form>
@@ -45,33 +47,18 @@
let socket;
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/Parameter'
+import { throttle } from 'lodash';
export default {
name: "Parameter",
mixins: [LanguageMixin],
data () {
return {
jsonData: data,
+
dialogVisible: true,
password: '',
activeButton: '',
- record: {
- params: [100, 200, 10, 10, 10, 10],
- xyData: [
- { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0, unit: "m/min" },
- { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0, unit: "m/min" },
- { name: "conveyor Velocity(Manual)", value: 0, value2: 0, unit: "m/min" },
- { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
- { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
- { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },
- { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
- { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" }
- ],
- canshu: []
- },
+
messagepack: {
data: { taskname: "" }
},
@@ -88,11 +75,20 @@
this.isButtonDisabled = true;
},
+ mounted() {
+ window.addEventListener('beforeunload', this.closeSocket);
+ },
+
+ beforeUnmount() {
+ window.removeEventListener('beforeunload', this.closeSocket);
+ },
methods: {
+ closeSocket() {
+ // 鍏抽棴 WebSocket 杩炴帴
+ socket.close();
+ },
showdata () {
- console.log(1111);
- console.log(this.jsonData.para[0].name);
- // console.log(this.record.xyData);
+
},
@@ -128,56 +124,39 @@
}
let obj = JSON.parse(msg.data);
-
-
+ // console.log(obj);
+ const jsonData2=this.jsonData;
+ // console.log(jsonData2);
+ const handleMouseMove = throttle(function (event) {
+ const inputBox = document.querySelectorAll('.input-box');
+ const target = event.target;
+ if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
if (obj.params && obj.state) {
-
-
-
- this.record.params[0] = obj.params[0];
- this.record.state = obj.state[0];
+
if (obj.state && obj.state.length > 0) {
- let isButtonDisabled = this.record.state.includes(1);
- this.isButtonDisabled = isButtonDisabled;
+
+// console.log( Array.isArray(jsonData2));
+
+
+// 灏� obj 涓殑 params 鍊兼洿鏂板埌 jsonData 涓殑 value 涓�
+for (let i = 0; i < obj.params[0].length; i++) {
+ jsonData2[i].value = obj.params[0][i];
+}
- // 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
- //console.log(isButtonDisabled)
- // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
-
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- // this.record.xyData[a] =
- // {
- // name: this.jsonData.para[a].name,
- // value: this.jsonData.para[a].read,
- // value2: this.jsonData.para[a].sending,
- // unit: this.jsonData.para[a].unit
- // };
-
- // if (!this.xyData[a]) {
- this.record.xyData[a] =
- {
- name: this.jsonData.para[a].name,
- value: this.record.params[0][a],
- unit: this.jsonData.para[a].unit
- };
- }
- // else {
- // this.xyData[a].value = this.record.params[0][a];
- // }
- // }
- const language = this.$i18n.locale;
- if (language === 'en-US') {
- this.replaceChineseWithEnglish();
- } else {
- this.localizedRoles = [...this.record.xyData];
- }
+
+
}
}
- this.$forceUpdate();
- this.replaceChineseWithEnglish();
- };
+ // this.$forceUpdate();
+ // this.replaceChineseWithEnglish();
+ }
+ }, 200);
+
+document.addEventListener('mouseover', handleMouseMove);
+
+};
// 鍏抽棴浜嬩欢
socket.onclose = function () {
@@ -188,11 +167,14 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
+ this.$router.afterEach(function(){
+ socket.close();
+ })
}
},
send () {
- this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value2)); // 杞崲涓烘暣鏁版暟缁�
- //console.log(this.messagepack);
+ this.messagepack.data = this.jsonData.map((item) => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
+ console.log(this.messagepack);
socket?.send(JSON.stringify(this.messagepack));
},
handleChange (index, value) {
@@ -201,7 +183,7 @@
//璇█杞崲
replaceChineseWithEnglish () {
const translation = this.$t('langparameter');
- this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
+ this.jsonData.para = this.jsonData.para.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
//console.log(translation);
},
}
@@ -218,6 +200,10 @@
border: 1px solid black;
border: none;
}
+.special-class{
+
+
+}
.in_mc {
--
Gitblit v1.8.0