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/Action.vue | 131 +++++++++++++++++++++++++++++++++++++------
1 files changed, 112 insertions(+), 19 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index 2218ad7..8c429b9 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -2,38 +2,131 @@
<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>
+ <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>寮�鍏虫帶鍒�</div>
+ <div>Action</div>
+ <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ records }">
+ <div class="kuai_sb" v-for="item in records" :key="item.id">
+ <el-input v-model="item.mingcheng" style="width: 280px;" class="in_mc"></el-input>
+ <!-- <el-input v-model="item.zhuangtai" style="width: 80px;"></el-input> -->
+ <el-switch v-model="item.zhuangtai" active-color="#13ce66" active-value="1" inactive-value="2"></el-switch>
+ </div>
+
+
+ <div class="kuai_div">
+ <el-input style="width: 280px;" class="in_mc" value="conveyor Velocity(Auto SLOW)"></el-input>
+ <el-input v-for="(param, index) in record.params[0]" :key="index" v-model="record.params[0][index]" style="width: 80px;"></el-input>
+</div>
+<button @click="send()">娴嬭瘯鍙戦��</button>
+ </el-form>
+
+
</div>
</template>
-<script>
-
-
+<script >
+let socket;
export default {
name: "Action",
+ data () {
+ return {
+ records: [
+ { id: 1, mingcheng: 'conveyor Velocity(Auto SLOW)', zhuangtai: "1" },
+ { id: 2, mingcheng: 'B01 B02 TRAVEL POS Velocity AUTO', zhuangtai: "2" },
+ { id: 3, mingcheng: 'B01 B02 TRAVEL JOG Velocity', zhuangtai: "2" },
+ { id: 4, mingcheng: 'conveyor Velocity(Manual)', zhuangtai: "1" }
+ ],
+ messagepack: {
+ data: { taskname: "" }
+ },
+
+ record: {
+ params: [0,0,0,0,0,0]
+ },
+
+ }
+ },
+ created () {
+ this.init();
+ //console.log(this.records);
+ },
+ methods: {
+ init () {
+ let viewname = "talkvue";
+
+ 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 = function (msg) {
+ console.log("鏀跺埌鏁版嵁====" + msg.data);
+ let obj = JSON.parse(msg.data);
+ this.$set(this.record.params, 0, obj.params[0]);
+ console.log( this.record.params[0])
+}.bind(this);
+ //鍏抽棴浜嬩欢
+ socket.onclose = function () {
+ console.log("websocket宸插叧闂�");
+ };
+ //鍙戠敓浜嗛敊璇簨浠�
+ socket.onerror = function () {
+ console.log("websocket鍙戠敓浜嗛敊璇�");
+ }
+ }
+ },
+ send () {
+ this.messagepack.data = { taskname: "鍓嶇鍒板悗鍙�" };
+ socket?.send(JSON.stringify(this.messagepack)); // 灏嗙粍瑁呭ソ鐨刯son鍙戦�佺粰鏈嶅姟绔紝鐢辨湇鍔＄杩涜杞彂
+ }
+
+ }
}
+
+
+
+
</script>
-<style lang="less" scoped>
-.el-table {
- margin-top: 15px;
- font-size: 12px;
+<style>
+.kuai_sb {
+ width: 30%;
+ margin-bottom: 15px;
}
-.el-pagination {
- margin-top: 15px;
+.el-input {
+ border: none;
+
+
+ .el-input__inner {
+ border: 1 solid black;
+ }
+
+
}
-.app .el-card {
- width: 99%;
+.in_mc {
+ .el-input__inner {
+ border: none;
+ }
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.8.0