From 92b68e97ff48e3e6411cee61439e95e216eb392e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 12:51:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 2795d46..a504e69 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -16,8 +16,51 @@
const dialogFormVisiblea2 = ref(false)
-const tableData = reactive([]);
+
+
+let socket;
+
+
+const initWebSocket = (token) =>{ //鍒濆鍖杦e
+
+let viewname = "unloadglass";
+
+if (typeof WebSocket === "undefined") {
+ console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
+} else {
+ let socketUrl = "ws://" + "localhost"+":88" + "/api/unLoadGlass/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);
+
+
+ console.log('鏀跺埌娑堟伅锛�', obj.data);
+
+ }
+
+ }
+ }
@@ -56,7 +99,7 @@
//鑾峰彇娴佺▼鍗″彿
const fetchFlowCardId = async () => {
try {
- const response = await unloadrequest.get('/api/downWorkstation/getflowCardId');
+ const response = await unloadrequest.get('/api/unLoadGlass/getflowCardId');
console.log(response)
if (response.code === 200) {
flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flowcard_id }));
@@ -70,7 +113,7 @@
//纭
const handleConfirm = async () => {
try {
- const response = await unloadrequest.post('/api/downWorkstation/updateFlowCardId', {
+ const response = await unloadrequest.post('/api/unLoadGlass/updateFlowCardId', {
workstationId: workstationId.value,
flowCardId: flowCardId.value
});
@@ -104,7 +147,7 @@
//娓呴櫎鍐呭
const handleclear = async () => {
try {
- const response = await unloadrequest.post('/api/downWorkstation/clear', {
+ const response = await unloadrequest.post('/api/unLoadGlass/clear', {
workstationId: workstationId.value,
});
@@ -131,13 +174,13 @@
-
+const tableData = reactive([]);
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
try {
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
- const response = await unloadrequest.get('/api/downWorkstation/getone');
+ const response = await unloadrequest.get('/api/unLoadGlass/getone');
// 妫�鏌ュ搷搴旂姸鎬�
if (response.code === 200) {
@@ -157,9 +200,9 @@
-// initWebSocket();
+initWebSocket();
onMounted(fetchTableData);
- setInterval(fetchTableData, 2000)
+setInterval(fetchTableData, 2000)
const open = () => {
ElMessageBox.confirm(
--
Gitblit v1.8.0