From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Parameter.vue | 193 +++++++++++++++++++++++++++++++-----------------
1 files changed, 125 insertions(+), 68 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index e9be395..94a34d4 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -2,53 +2,64 @@
<div class="app">
<!-- 闈㈠寘灞戝鑸尯鍩� -->
<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>
- <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('ServoManual')
+ }}</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()">涓嬪彂鍙傛暟</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>
+ <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 type="number" style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+ <span style="margin-right: 5px; width: 50px;">{{ item.unit }}</span>
+
+ </div>
</el-form>
+
+ <div>
+
+ </div>
</div>
</template>
<script>
-let socket;
+let socket;
+import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Parameter'
export default {
name: "Parameter",
- data() {
+ 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 },
- { 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 }
+
],
canshu: []
},
@@ -61,91 +72,135 @@
}
};
},
-
-
- created() {
+
+
+ created () {
this.initWebSocket();
+ this.isButtonDisabled = true;
+
+
},
methods: {
- initWebSocket() {
+
+
+ setActiveButton (buttonName) {
+ this.activeButton = buttonName;
+ },
+ initWebSocket () {
let viewname = "Parameter";
-
+
if (typeof WebSocket === "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
-
+
if (socket != null) {
socket.close();
socket = null;
}
-
+
// 寮�鍚竴涓獁ebsocket鏈嶅姟
socket = new WebSocket(socketUrl);
-
+
// 鎵撳紑浜嬩欢
socket.onopen = function () {
console.log("websocket宸叉墦寮�");
};
-
+
// 鏀跺埌娑堟伅
socket.onmessage = (msg) => {
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
}
-
+
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];
+
+
+ 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;
+
+
+ this.record.xyData = this.jsonData.para;
+
+ for (let a = 0; a < this.record.xyData.length; a++) {
+ this.record.xyData[a].value = this.record.params[0][a];
+
+ }
+
+ this.record.xyData = this.jsonData.para.filter(item => {
+ return item.state != 0;
+ }
+
+ );
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
}
}
-
- console.log(this.record.xyData);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
};
-
+
// 鍏抽棴浜嬩欢
socket.onclose = function () {
console.log("websocket宸插叧闂�");
};
-
+
// 鍙戠敓閿欒浜嬩欢
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
}
},
- send() {
+ send () {
this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value2)); // 杞崲涓烘暣鏁版暟缁�
- console.log(this.messagepack);
+ //console.log(this.messagepack);
socket?.send(JSON.stringify(this.messagepack));
},
- handleChange(index, value) {
+ handleChange (index, value) {
this.record.xyData[index].value = value;
- }
+ },
+ //璇█杞崲
+ 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 }; });
+ //console.log(translation);
+ },
}
};
</script>
-<style>
+<style scoped>
.kuai_div {
- width: calc(100% / 3);
+ width: calc(100% / 2);
margin-bottom: 15px;
}
.el-input__inner {
border: 1px solid black;
-}
-.in_mc{
-
- border:none;
+ border: none;
}
+.special-class {}
+
+.in_mc {
+
+ border: none;
+}
+
+.blue-button {
+ background-color: skyblue;
+
+}
#btn_div {
width: 100%;
@@ -154,13 +209,15 @@
#btn_div .el-button {
float: right;
}
-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>
--
Gitblit v1.8.0