From ff6fd31ba5a4b6a6e74096786ff6d61293d15c73 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 04 十二月 2023 09:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Parameter.vue | 310 ++++++++++++++++++++-------------------------------
1 files changed, 124 insertions(+), 186 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index a962b56..bb15ca4 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -1,105 +1,64 @@
<template>
<div class="app">
-<<<<<<< HEAD
<!-- 闈㈠寘灞戝鑸尯鍩� -->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
- <el-button type="text">璁惧绠＄悊</el-button>
-=======
- <!--闈㈠寘灞戝鑸尯鍩�-->
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
- <el-button type="text">{{ $t('Distribute') }}</el-button>
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
- <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text">State</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text">Alarm</router-link>
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+ }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+ }}</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/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>
-<<<<<<< HEAD
-
+
<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()">涓嬪彂鍙傛暟</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">
- <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;">|</span>
- <input v-model="item.value2" type="number" style="width: 30px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
-</div>
+ <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> -->
+ <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>
+
+ <div>
+
+ </div>
</div>
</template>
<script>
-=======
- <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()">{{ $t('Distribute') }}</el-button>
- </div>
- <div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
- <el-input style="width: 280px;" class="in_mc" v-model="item.name" readonly></el-input>
- <el-input v-model.number="item.value" style="width: 80px;"
- @input="handleChange(index, $event.target.value)"></el-input>
- </div>
- </el-form>
- </div>
-</template>
-
-<script>
-
-import LanguageMixin from '../../lang/LanguageMixin'
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
let socket;
-
+import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Parameter'
+import { throttle } from 'lodash';
export default {
name: "Parameter",
-<<<<<<< HEAD
- data() {
-=======
mixins: [LanguageMixin],
data () {
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
return {
- record: {
- params: [100, 200, 10, 10, 10, 10],
- xyData: [
-<<<<<<< HEAD
- { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0 },
- { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0 },
- { name: "conveyor Velocity(Manual)", value: 0 ,value2: 0 },
- { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0 },
- { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0 },
- { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0 }
-=======
- { name: "conveyor Velocity(Auto FAST)", value: 0 },
- { name: "conveyor Velocity(Auto SLOW)", value: 0 },
- { name: "conveyor Velocity(Manual)", value: 0 },
- { name: "A01 A02 TURN JOG Velocity", value: 0 },
- { name: "A01 A02 TRAVEL JOG Velocity", value: 0 },
- { name: "B01 B02 TRAVEL JOG Velocity", value: 0 },
- { name: "A01 A02 TURN POS Velocity AUTO", value: 0 },
- { name: "A01 A02 TURN POS Velocity manual", value: 0 },
- { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0 },
- { name: "A01 A02 TRAVEL POS Velocity manual", value: 0 },
- { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0 },
- { name: "B01 B02 TRAVEL POS Velocity manual", value: 0 }
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
- ],
- canshu: []
- },
+ jsonData: data,
+
+ dialogVisible: true,
+ password: '',
+ activeButton: '',
+
messagepack: {
data: { taskname: "" }
},
@@ -109,172 +68,153 @@
}
};
},
-<<<<<<< HEAD
-
-
- created() {
- this.initWebSocket();
- },
- methods: {
- initWebSocket() {
- let viewname = "Parameter";
-
-=======
+
+
created () {
this.initWebSocket();
+ this.isButtonDisabled = true;
+
+ },
+ mounted() {
+ window.addEventListener('beforeunload', this.closeSocket);
+ },
+
+ beforeUnmount() {
+ window.removeEventListener('beforeunload', this.closeSocket);
},
methods: {
+ closeSocket() {
+ // 鍏抽棴 WebSocket 杩炴帴
+ socket.close();
+ },
+ showdata () {
+
+
+ },
+
+
+ setActiveButton (buttonName) {
+ this.activeButton = buttonName;
+ },
initWebSocket () {
let viewname = "Parameter";
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
if (typeof WebSocket === "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
-<<<<<<< HEAD
-
-=======
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
if (socket != null) {
socket.close();
socket = null;
}
-<<<<<<< HEAD
-
- // 寮�鍚竴涓獁ebsocket鏈嶅姟
- socket = new WebSocket(socketUrl);
-
-=======
// 寮�鍚竴涓獁ebsocket鏈嶅姟
socket = new WebSocket(socketUrl);
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鎵撳紑浜嬩欢
socket.onopen = function () {
console.log("websocket宸叉墦寮�");
};
-<<<<<<< HEAD
-
-=======
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鏀跺埌娑堟伅
socket.onmessage = (msg) => {
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
-<<<<<<< HEAD
- }
-
- let obj = JSON.parse(msg.data);
- this.record.params[0] = obj.params[0];
-
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
- } else {
- this.record.xyData[a].value = this.record.params[0][a];
- }
- }
-
- console.log(this.record.xyData);
- this.$forceUpdate();
- };
-
-=======
}
let obj = JSON.parse(msg.data);
- this.record.params[0] = obj.params[0];
+ // 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) {
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
- } else {
- this.record.xyData[a].value = this.record.params[0][a];
+
+ if (obj.state && obj.state.length > 0) {
+
+// 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];
+}
+
+
+
+
}
}
+ // this.$forceUpdate();
+ // this.replaceChineseWithEnglish();
+ }
+ }, 200);
- console.log(this.record.xyData);
- this.$forceUpdate();
- };
+document.addEventListener('mouseover', handleMouseMove);
+
+};
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鍏抽棴浜嬩欢
socket.onclose = function () {
console.log("websocket宸插叧闂�");
};
-<<<<<<< HEAD
-
-=======
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鍙戠敓閿欒浜嬩欢
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
+ this.$router.afterEach(function(){
+ socket.close();
+ })
}
},
-<<<<<<< HEAD
- send() {
- this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value2)); // 杞崲涓烘暣鏁版暟缁�
- console.log(this.messagepack);
- socket?.send(JSON.stringify(this.messagepack));
- },
- handleChange(index, value) {
-=======
send () {
- this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
- 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) {
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
this.record.xyData[index].value = value;
- }
+ },
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('langparameter');
+ this.jsonData.para = this.jsonData.para.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
+ //console.log(translation);
+ },
}
};
</script>
-<<<<<<< HEAD
-<style>
+<style scoped>
.kuai_div {
- width: calc(100% / 3);
+ width: calc(100% / 2);
margin-bottom: 15px;
}
.el-input__inner {
border: 1px solid black;
+ border: none;
}
-.in_mc{
+.special-class{
- border:none;
+
}
+.in_mc {
-=======
-
-<style>
-.kuai_div {
- width: 30%;
- margin-bottom: 15px;
-}
-
-.el-input {
border: none;
}
-.el-input__inner {
- border: 1px solid black;
+.blue-button {
+ background-color: skyblue;
+
}
-.in_mc .el-input__inner {
- border: none;
-}
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
#btn_div {
width: 100%;
}
@@ -282,17 +222,15 @@
#btn_div .el-button {
float: right;
}
-<<<<<<< HEAD
-input[type="number"]::-webkit-inner-spin-button,
- input[type="number"]::-webkit-outer-spin-button {
- -webkit-appearance: none;
- margin: 0;
- }
- input[type="number"] {
- -moz-appearance: textfield; /* Firefox涓鐢ㄤ笂涓嬬澶� */
- }
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+}
+
+input[type="number"] {
+ -moz-appearance: textfield;
+ /* Firefox涓鐢ㄤ笂涓嬬澶� */
+}
</style>
-=======
-</style>
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
--
Gitblit v1.8.0