From 3ed50045139eb39c6cbe860f475905b38691ad3c Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 08 九月 2023 17:10:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Parameter.vue | 174 ++++++++-------------------------------------------------
1 files changed, 25 insertions(+), 149 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index a962b56..d30361f 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -1,29 +1,22 @@
<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
+ <el-button type="text">Electrical</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>
</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">涓嬪彂鍙傛暟</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>
@@ -36,41 +29,15 @@
</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;
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 },
@@ -83,20 +50,6 @@
{ 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: []
},
@@ -109,135 +62,83 @@
}
};
},
-<<<<<<< HEAD
created() {
this.initWebSocket();
+ this.isButtonDisabled = true;
},
methods: {
initWebSocket() {
let viewname = "Parameter";
-=======
- created () {
- this.initWebSocket();
- },
- methods: {
- 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();
- };
-
-=======
- }
+ if (!msg.data) {
+ return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+ }
- let obj = JSON.parse(msg.data);
- this.record.params[0] = obj.params[0];
+ let obj = JSON.parse(msg.data);
+ this.record.params[0] = obj.params[0];
+ this.record.state = obj.state[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];
- }
- }
+ let isButtonDisabled = this.record.state.includes(1);
+ // 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
+ console.log(isButtonDisabled)
+ this.isButtonDisabled = isButtonDisabled; // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
- console.log(this.record.xyData);
- this.$forceUpdate();
- };
+ 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];
+ }
+ }
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
+ console.log(this.record.xyData);
+ this.$forceUpdate();
+};
+
// 鍏抽棴浜嬩欢
socket.onclose = function () {
console.log("websocket宸插叧闂�");
};
-<<<<<<< HEAD
-=======
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鍙戠敓閿欒浜嬩欢
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
}
},
-<<<<<<< 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);
- socket?.send(JSON.stringify(this.messagepack));
- },
- handleChange (index, value) {
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
this.record.xyData[index].value = value;
}
}
};
</script>
-<<<<<<< HEAD
<style>
.kuai_div {
@@ -254,27 +155,6 @@
}
-=======
-
-<style>
-.kuai_div {
- width: 30%;
- margin-bottom: 15px;
-}
-
-.el-input {
- border: none;
-}
-
-.el-input__inner {
- border: 1px solid black;
-}
-
-.in_mc .el-input__inner {
- border: none;
-}
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
#btn_div {
width: 100%;
}
@@ -282,7 +162,6 @@
#btn_div .el-button {
float: right;
}
-<<<<<<< HEAD
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none;
@@ -293,6 +172,3 @@
-moz-appearance: textfield; /* Firefox涓鐢ㄤ笂涓嬬澶� */
}
</style>
-=======
-</style>
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
--
Gitblit v1.8.0