From baef763e1319d58eda668a5cac6edd8a150defd8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 05 九月 2023 17:00:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Parameter.vue | 215 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 143 insertions(+), 72 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index e54c476..49a02c8 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -1,81 +1,152 @@
<template>
<div class="app">
- <!--闈㈠寘灞戝鑸尯鍩�-->
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <el-breadcrumb-item :to="{ path: '/home' }">{{ $t('langHome') }}</el-breadcrumb-item>
- <el-breadcrumb-item>璁惧绠＄悊</el-breadcrumb-item>
- <el-breadcrumb-item :to="{ path: '/Electrical/Parameter' }">鍙傛暟</el-breadcrumb-item>
- <el-breadcrumb-item :to="{ path: '/Electrical/Action' }">寮�鍏虫帶鍒�</el-breadcrumb-item>
- <el-breadcrumb-item :to="{ path: '/Electrical/Sign' }">IO鐘舵��</el-breadcrumb-item>
- <el-breadcrumb-item :to="{ path: '/Electrical/State' }">鎶ヨ淇℃伅</el-breadcrumb-item>
- </el-breadcrumb>
- <div>鍙傛暟</div>
- <el-row :gutter="40" style="display: flex;flex-wrap: wrap;">
- <el-col :span="7">
- <div class="grid-content bg-purple">
- <el-input prop="sbname"></el-input>
- <el-input prop="sbdata"></el-input>
- </div>
- </el-col>
-
- </el-row>
+ <!--闈㈠寘灞戝鑸尯鍩�-->
+ <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>
+ </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>
+ </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="item.value" style="width: 80px;"></el-input>
+ </div>
+ </el-form>
</div>
-</template>
-
-<script>
-
-
-export default {
+ </template>
+
+ <script>
+ let socket;
+
+ export default {
name: "Parameter",
- // data () {
- // return {
- // sbList: {
- // records: [],
- // }
- // }
- // }
-}
-
-</script>
-
-<style lang="less" scoped>
-.el-row {
- margin-bottom: 20px;
-
- &:last-child {
- margin-bottom: 0;
+ data() {
+ return {
+ record: {
+ params: [0, 0, 0, 0, 0, 0],
+ xyData: [{ name: "conveyor Velocity(Auto SLOW)", value: 0 },
+ { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0 },
+ { name: "B01 B02 TRAVEL JOG Velocity", value: 0 },
+ { name: "conveyor Velocity(Manual)", value: 0},
+ { name: "B01 B02 TRAVEL JOG Velocity", value: 0},
+ { name: "conveyor Velocity(Manual)", value: 0 }],
+ canshu: [
+ 'conveyor Velocity(Auto SLOW)',
+ 'B01 B02 TRAVEL POS Velocity AUTO',
+ 'B01 B02 TRAVEL JOG Velocity',
+ 'conveyor Velocity(Manual)',
+ 'B01 B02 TRAVEL JOG Velocity',
+ 'conveyor Velocity(Manual)'
+ ],
+ },
+ messagepack: {
+ data: { taskname: "" }
+ },
+ queryInfo: {
+ data: "1",
+ pageSize: 10
+ },
}
-}
+ },
+ created() {
+ this.initWebSocket();
+ },
+ methods: {
+ initWebSocket() {
+ let viewname = "action";
+
+ if (typeof WebSocket == "undefined") {
+ console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
+ } else {
+ //console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
+
+ 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; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+ }
-.el-col {
- border-radius: 4px;
- margin: 10px;
-}
+ let obj = JSON.parse(msg.data);
+ this.record.params[0] = obj.params[0];
-.el-input {
- width: 70px;
- height: 30px;
-}
+ 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];
+ }
+ }
-.bg-purple-dark {
- background: #99a9bf;
+ console.log(this.record.xyData);
+ this.$forceUpdate();
+};
+
+ // 鍏抽棴浜嬩欢
+ socket.onclose = function () {
+ console.log("websocket宸插叧闂�");
+ };
+
+ // 鍙戠敓閿欒浜嬩欢
+ socket.onerror = function () {
+ console.log("websocket鍙戠敓浜嗛敊璇�");
+ }
+ }
+ },
+ send() {
+ this.messagepack.data = this.record.xyData.map(item => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
+ console.log(this.messagepack);
+ socket?.send(JSON.stringify(this.messagepack));
}
-
-.bg-purple {
- background: #d3dce6;
-}
-
-.bg-purple-light {
- background: #e5e9f2;
-}
-
-.grid-content {
- border-radius: 4px;
- min-height: 36px;
-}
-
-.row-bg {
- padding: 10px 0;
- background-color: #f9fafc;
-}
-</style>
+ }
+ }
+ </script>
+
+ <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;
+ }
+
+ #btn_div {
+ width: 100%;
+ }
+
+ #btn_div .el-button {
+ float: right;
+ }
+ </style>
\ No newline at end of file
--
Gitblit v1.8.0